docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
<mask>
<mask> Dns.propTypes = {
<mask> dashboard: PropTypes.object.isRequired,
<mask> settings: PropTypes.object.isRequired,
<mask> setUpstream: PropTypes.func.isRequired,
<mask> testUpstream: PropTypes.func.isRequired,
<mask> getAccessList: PropTypes.func.isRequired,
<mask> setAccessList: PropTypes.func.isRequired,
<mask> access: PropTypes.object.isRequired,
<mask> getDnsSettings: PropTypes.func.isRequired,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove dashboard: PropTypes.object.isRequired,
</s> add </s> remove getDnsSettings: PropTypes.func.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
|
<mask> testUpstream: PropTypes.func.isRequired,
<mask> getAccessList: PropTypes.func.isRequired,
<mask> setAccessList: PropTypes.func.isRequired,
<mask> access: PropTypes.object.isRequired,
<mask> getDnsSettings: PropTypes.func.isRequired,
<mask> dnsConfig: PropTypes.object.isRequired,
<mask> setDnsConfig: PropTypes.func.isRequired,
<mask> getDnsConfig: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove setUpstream: PropTypes.func.isRequired,
</s> add </s> remove dashboard: PropTypes.object.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
|
color: var(--gray); | <mask> .checkbox__input:disabled + .checkbox__label {
<mask> cursor: default;
<mask> }
<mask>
<mask> .checkbox__input:disabled + .checkbox__label:before {
<mask> opacity: 0.6;
<mask> }
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> remove await apiClient.setDnsConfig(config);
dispatch(addSuccessToast('config_successfully_saved'));
</s> add const data = { ...config };
let hasDnsSettings = false;
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
hasDnsSettings = true;
}
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
data.upstream_dns = normalizeTextarea(config.upstream_dns);
hasDnsSettings = true;
}
await apiClient.setDnsConfig(data);
if (hasDnsSettings) {
dispatch(addSuccessToast('updated_upstream_dns_toast'));
} else {
dispatch(addSuccessToast('config_successfully_saved'));
}
</s> remove dashboard: PropTypes.object.isRequired,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/ui/Checkbox.css |
import { testUpstream } from '../actions'; | <mask> import { connect } from 'react-redux';
<mask> import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
<mask> import { getAccessList, setAccessList } from '../actions/access';
<mask> import {
<mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove this.props.getDnsSettings();
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/containers/Dns.js |
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> handleUpstreamChange,
<mask> setUpstream,
<mask> testUpstream,
<mask> getAccessList,
<mask> setAccessList,
<mask> getRewritesList,
<mask> addRewrite,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove dashboard,
</s> add </s> remove setUpstream,
</s> add </s> remove getDnsSettings,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/containers/Dns.js |
|
<mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
<mask> toggleRewritesModal,
<mask> getDnsSettings,
<mask> getDnsConfig,
<mask> setDnsConfig,
<mask> };
<mask>
<mask> export default connect(
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/containers/Dns.js |
|
onClick, | <mask> placeholder,
<mask> subtitle,
<mask> disabled,
<mask> modifier = 'checkbox--form',
<mask> meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/helpers/form.js |
<Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> | <mask> disabled,
<mask> modifier = 'checkbox--form',
<mask> meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className={`checkbox ${modifier}`}>
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text checkbox__label-text--long">
<mask> <span className="checkbox__label-title">{placeholder}</span>
<mask> {subtitle && (
<mask> <span
<mask> className="checkbox__label-subtitle"
<mask> dangerouslySetInnerHTML={{ __html: subtitle }}
<mask> />
<mask> )}
<mask> </span>
<mask> </span>
<mask> </label>
<mask> {!disabled &&
<mask> touched &&
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove </span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
</s> add </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment> </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : </s> remove const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !dnsConfig.processingGetConfig;
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig; </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/helpers/form.js |
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment> | <mask> dangerouslySetInnerHTML={{ __html: subtitle }}
<mask> />
<mask> )}
<mask> </span>
<mask> </span>
<mask> </label>
<mask> {!disabled &&
<mask> touched &&
<mask> (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask>
<mask> export const renderServiceField = ({
<mask> input,
<mask> placeholder,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> </s> remove </Fragment>
)}
</s> add </Fragment>} </s> remove const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !dnsConfig.processingGetConfig;
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig; </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/helpers/form.js |
upstream_dns,
bootstrap_dns, | <mask> const {
<mask> blocking_ipv4,
<mask> blocking_ipv6,
<mask> ...values
<mask> } = payload;
<mask>
<mask> return {
<mask> ...state,
<mask> ...values,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove language,
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/dnsConfig.js |
upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', | <mask> blocking_ipv4: blocking_ipv4 || DEFAULT_BLOCKING_IPV4,
<mask> blocking_ipv6: blocking_ipv6 || DEFAULT_BLOCKING_IPV6,
<mask> processingGetConfig: false,
<mask> };
<mask> },
<mask>
<mask> [actions.setDnsConfigRequest]: state => ({ ...state, processingSetConfig: true }),
<mask> [actions.setDnsConfigFailure]: state =>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove submitting || invalid || processingSetUpstream || processingTestUpstream
</s> add submitting || invalid || processingSetConfig || processingTestUpstream | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/dnsConfig.js |
<mask> const newSetting = { ...setting, enabled: !setting.enabled };
<mask> const newSettingsList = { ...settingsList, [settingKey]: newSetting };
<mask> return { ...state, settingsList: newSettingsList };
<mask> },
<mask> [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
<mask> [actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
<mask> [actions.setUpstreamSuccess]: (state, { payload }) => ({
<mask> ...state,
<mask> ...payload,
<mask> processingSetUpstream: false,
<mask> }),
<mask>
<mask> [actions.testUpstreamRequest]: state => ({ ...state, processingTestUpstream: true }),
<mask> [actions.testUpstreamFailure]: state => ({ ...state, processingTestUpstream: false }),
<mask> [actions.testUpstreamSuccess]: state => ({ ...state, processingTestUpstream: false }),
<mask> },
<mask> {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove processingSetUpstream: false,
</s> add </s> remove }) => (
</s> add }) => | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
<mask> },
<mask> {
<mask> processing: true,
<mask> processingTestUpstream: false,
<mask> processingSetUpstream: false,
<mask> processingDhcpStatus: false,
<mask> settingsList: {},
<mask> },
<mask> );
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingDnsSettings: true,
</s> add </s> remove upstreamDns: '',
bootstrapDns: '',
allServers: false,
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
<mask> const {
<mask> version,
<mask> dns_port: dnsPort,
<mask> dns_addresses: dnsAddresses,
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> protection_enabled: protectionEnabled,
<mask> language,
<mask> http_port: httpPort,
<mask> } = payload;
<mask> const newState = {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove language,
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, </s> remove disabled={!upstreamDns || processingTestUpstream}
</s> add disabled={!upstream_dns || processingTestUpstream} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> protection_enabled: protectionEnabled,
<mask> language,
<mask> http_port: httpPort,
<mask> } = payload;
<mask> const newState = {
<mask> ...state,
<mask> isCoreRunning: true,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
language, | <mask> dns_port: dnsPort,
<mask> dns_addresses: dnsAddresses,
<mask> protection_enabled: protectionEnabled,
<mask> http_port: httpPort,
<mask> } = payload;
<mask> const newState = {
<mask> ...state,
<mask> isCoreRunning: true,
<mask> processing: false,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove language,
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove processingDnsSettings: true,
</s> add </s> remove processingSetUpstream: false,
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
<mask> processing: false,
<mask> dnsVersion: version,
<mask> dnsPort,
<mask> dnsAddresses,
<mask> upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
<mask> bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
<mask> allServers,
<mask> protectionEnabled,
<mask> language,
<mask> httpPort,
<mask> };
<mask> return newState;
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove processingDnsSettings: true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
<mask> };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.handleUpstreamChange]: (state, { payload }) => {
<mask> const { upstreamDns } = payload;
<mask> return { ...state, upstreamDns };
<mask> },
<mask>
<mask> [actions.getLanguageSuccess]: (state, { payload }) => {
<mask> const newState = { ...state, language: payload };
<mask> return newState;
<mask> },
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
<mask> };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
<mask> [actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
<mask> [actions.getDnsSettingsSuccess]: (state, { payload }) => {
<mask> const {
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> } = payload;
<mask>
<mask> return {
<mask> ...state,
<mask> allServers,
<mask> upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
<mask> bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
<mask> processingDnsSettings: false,
<mask> };
<mask> },
<mask>
<mask> [actions.getProfileRequest]: state => ({ ...state, processingProfile: true }),
<mask> [actions.getProfileFailure]: state => ({ ...state, processingProfile: false }),
<mask> [actions.getProfileSuccess]: (state, { payload }) => ({
<mask> ...state,
<mask> name: payload.name,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove language,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
<mask> isCoreRunning: true,
<mask> processingVersion: true,
<mask> processingClients: true,
<mask> processingUpdate: false,
<mask> processingDnsSettings: true,
<mask> processingProfile: true,
<mask> upstreamDns: '',
<mask> bootstrapDns: '',
<mask> allServers: false,
<mask> protectionEnabled: false,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: '',
bootstrapDns: '',
allServers: false,
</s> add </s> remove processingSetUpstream: false,
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
<mask> processingClients: true,
<mask> processingUpdate: false,
<mask> processingDnsSettings: true,
<mask> processingProfile: true,
<mask> upstreamDns: '',
<mask> bootstrapDns: '',
<mask> allServers: false,
<mask> protectionEnabled: false,
<mask> processingProtection: false,
<mask> httpPort: 80,
<mask> dnsPort: 53,
<mask> dnsAddresses: [],
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingDnsSettings: true,
</s> add </s> remove processingSetUpstream: false,
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
|
formatTodayDate, | <mask> formatTime,
<mask> formatDateTime,
<mask> } from '../../helpers/helpers';
<mask> import { SERVICES, FILTERED_STATUS, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants';
<mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import { formatClientCell } from '../../helpers/formatClientCell';
<mask>
</s> + client: show date in query logs </s> remove maxWidth: 100,
</s> add minWidth: 105, </s> remove <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTime(value)}
</span>
</div>
</s> add <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTodayDate(value) === formatTodayDate(Date.now())
? formatTime(value) : formatDateTime(value)}
</span>
</div> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/components/Logs/index.js |
<div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTodayDate(value) === formatTodayDate(Date.now())
? formatTime(value) : formatDateTime(value)}
</span>
</div> | <mask>
<mask> checkWhiteList = reason => reason === FILTERED_STATUS.NOT_FILTERED_WHITE_LIST;
<mask>
<mask> getTimeCell = ({ value }) => (
<mask> <div className="logs__row">
<mask> <span className="logs__text" title={formatDateTime(value)}>
<mask> {formatTime(value)}
<mask> </span>
<mask> </div>
<mask> );
<mask>
<mask> getDomainCell = (row) => {
<mask> const response = row.value;
<mask> const trackerData = getTrackerData(response);
</s> + client: show date in query logs </s> remove maxWidth: 100,
</s> add minWidth: 105, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/components/Logs/index.js |
minWidth: 105, | <mask> const columns = [
<mask> {
<mask> Header: t('time_table_header'),
<mask> accessor: 'time',
<mask> maxWidth: 100,
<mask> Cell: this.getTimeCell,
<mask> },
<mask> {
<mask> Header: t('domain_name_table_header'),
<mask> accessor: 'domain',
</s> + client: show date in query logs </s> remove <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTime(value)}
</span>
</div>
</s> add <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTodayDate(value) === formatTodayDate(Date.now())
? formatTime(value) : formatDateTime(value)}
</span>
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/components/Logs/index.js |
export const formatTodayDate = (dateTime) => {
const currentLanguage = i18n.languages[0] || 'en';
const parsedTime = dateParse(dateTime);
const options = {
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour12: false,
};
return parsedTime.toLocaleString(currentLanguage, options);
};
| <mask> };
<mask>
<mask> export const normalizeLogs = logs => logs.map((log) => {
<mask> const {
<mask> time,
<mask> question,
<mask> answer: response,
<mask> reason,
</s> + client: show date in query logs </s> remove maxWidth: 100,
</s> add minWidth: 105, </s> remove <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTime(value)}
</span>
</div>
</s> add <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTodayDate(value) === formatTodayDate(Date.now())
? formatTime(value) : formatDateTime(value)}
</span>
</div> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/helpers/helpers.js |
'GO_VERSION': '1.19.8' | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.19.7'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | .github/workflows/build.yml |
'GO_VERSION': '1.19.8' | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.19.7'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | .github/workflows/lint.yml |
'dockerGo': 'adguard/golang-ubuntu:6.3' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.3' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.3' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.3' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/test.yaml |
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 | <mask> github.com/kisielk/errcheck v1.6.3
<mask> github.com/kyoh86/looppointer v0.2.1
<mask> github.com/securego/gosec/v2 v2.15.0
<mask> golang.org/x/tools v0.7.0
<mask> golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
<mask> honnef.co/go/tools v0.4.3
<mask> mvdan.cc/gofumpt v0.4.0
<mask> mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8
<mask> )
<mask>
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.mod |
golang.org/x/mod v0.10.0 // indirect | <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
<mask> golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29 // indirect
<mask> golang.org/x/mod v0.9.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/sys v0.6.0 // indirect
<mask> gopkg.in/yaml.v3 v3.0.1 // indirect
<mask> )
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.mod |
golang.org/x/sys v0.7.0 // indirect | <mask> golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29 // indirect
<mask> golang.org/x/mod v0.9.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/sys v0.6.0 // indirect
<mask> gopkg.in/yaml.v3 v3.0.1 // indirect
<mask> )
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.mod |
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | <mask> golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
<mask> golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.sum |
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
<mask> golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.sum |
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= | <mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
<mask> golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
<mask> golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
<mask> golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.sum |
testname string
rules []string
hostname string
isFiltered bool
reason Reason | <mask> var regexRules = []string{"/example\\.org/", "@@||test.example.org^"}
<mask> var maskRules = []string{"test*.example.org^", "exam*.com"}
<mask>
<mask> var tests = []struct {
<mask> testname string
<mask> rules []string
<mask> hostname string
<mask> result bool
<mask> }{
<mask> {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true},
<mask> {"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false},
<mask> {"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false},
<mask> {"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false},
</s> dnsfilter -- Update tests to check for expected filter/nofilter reason as well. </s> remove {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true},
{"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false},
{"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false},
{"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false},
{"blocking", blockingRules, "example.org", true},
{"blocking", blockingRules, "test.example.org", true},
{"blocking", blockingRules, "test.test.example.org", true},
{"blocking", blockingRules, "testexample.org", false},
{"blocking", blockingRules, "onemoreexample.org", false},
{"whitelist", whitelistRules, "example.org", true},
{"whitelist", whitelistRules, "test.example.org", false},
{"whitelist", whitelistRules, "test.test.example.org", false},
{"whitelist", whitelistRules, "testexample.org", false},
{"whitelist", whitelistRules, "onemoreexample.org", false},
{"important", importantRules, "example.org", false},
{"important", importantRules, "test.example.org", true},
{"important", importantRules, "test.test.example.org", true},
{"important", importantRules, "testexample.org", false},
{"important", importantRules, "onemoreexample.org", false},
{"regex", regexRules, "example.org", true},
{"regex", regexRules, "test.example.org", false},
{"regex", regexRules, "test.test.example.org", false},
{"regex", regexRules, "testexample.org", true},
{"regex", regexRules, "onemoreexample.org", true},
{"mask", maskRules, "test.example.org", true},
{"mask", maskRules, "test2.example.org", true},
{"mask", maskRules, "example.com", true},
{"mask", maskRules, "exampleeee.com", true},
{"mask", maskRules, "onemoreexamsite.com", true},
{"mask", maskRules, "example.org", false},
{"mask", maskRules, "testexample.org", false},
{"mask", maskRules, "example.co.uk", false},
</s> add {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true, FilteredBlackList},
{"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false, NotFilteredNotFound},
{"blocking", blockingRules, "example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "testexample.org", false, NotFilteredNotFound},
{"blocking", blockingRules, "onemoreexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "example.org", true, FilteredBlackList},
{"whitelist", whitelistRules, "test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "test.test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "testexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "onemoreexample.org", false, NotFilteredNotFound},
{"important", importantRules, "example.org", false, NotFilteredWhiteList},
{"important", importantRules, "test.example.org", true, FilteredBlackList},
{"important", importantRules, "test.test.example.org", true, FilteredBlackList},
{"important", importantRules, "testexample.org", false, NotFilteredNotFound},
{"important", importantRules, "onemoreexample.org", false, NotFilteredNotFound},
{"regex", regexRules, "example.org", true, FilteredBlackList},
{"regex", regexRules, "test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "test.test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "testexample.org", true, FilteredBlackList},
{"regex", regexRules, "onemoreexample.org", true, FilteredBlackList},
{"mask", maskRules, "test.example.org", true, FilteredBlackList},
{"mask", maskRules, "test2.example.org", true, FilteredBlackList},
{"mask", maskRules, "example.com", true, FilteredBlackList},
{"mask", maskRules, "exampleeee.com", true, FilteredBlackList},
{"mask", maskRules, "onemoreexamsite.com", true, FilteredBlackList},
{"mask", maskRules, "example.org", false, NotFilteredNotFound},
{"mask", maskRules, "testexample.org", false, NotFilteredNotFound},
{"mask", maskRules, "example.co.uk", false, NotFilteredNotFound}, </s> remove if ret.IsFiltered != test.result {
t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret, test.result)
</s> add if ret.IsFiltered != test.isFiltered {
t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret.IsFiltered, test.isFiltered)
}
if ret.Reason != test.reason {
t.Errorf("Hostname %s has wrong reason (%v must be %v)", test.hostname, ret.Reason.String(), test.reason.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1102963fa09bb5708dfd9bff9449ffd303a47701 | dnsfilter/dnsfilter_test.go |
{"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true, FilteredBlackList},
{"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false, NotFilteredNotFound},
{"blocking", blockingRules, "example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "testexample.org", false, NotFilteredNotFound},
{"blocking", blockingRules, "onemoreexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "example.org", true, FilteredBlackList},
{"whitelist", whitelistRules, "test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "test.test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "testexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "onemoreexample.org", false, NotFilteredNotFound},
{"important", importantRules, "example.org", false, NotFilteredWhiteList},
{"important", importantRules, "test.example.org", true, FilteredBlackList},
{"important", importantRules, "test.test.example.org", true, FilteredBlackList},
{"important", importantRules, "testexample.org", false, NotFilteredNotFound},
{"important", importantRules, "onemoreexample.org", false, NotFilteredNotFound},
{"regex", regexRules, "example.org", true, FilteredBlackList},
{"regex", regexRules, "test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "test.test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "testexample.org", true, FilteredBlackList},
{"regex", regexRules, "onemoreexample.org", true, FilteredBlackList},
{"mask", maskRules, "test.example.org", true, FilteredBlackList},
{"mask", maskRules, "test2.example.org", true, FilteredBlackList},
{"mask", maskRules, "example.com", true, FilteredBlackList},
{"mask", maskRules, "exampleeee.com", true, FilteredBlackList},
{"mask", maskRules, "onemoreexamsite.com", true, FilteredBlackList},
{"mask", maskRules, "example.org", false, NotFilteredNotFound},
{"mask", maskRules, "testexample.org", false, NotFilteredNotFound},
{"mask", maskRules, "example.co.uk", false, NotFilteredNotFound}, | <mask> rules []string
<mask> hostname string
<mask> result bool
<mask> }{
<mask> {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true},
<mask> {"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false},
<mask> {"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false},
<mask> {"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false},
<mask> {"blocking", blockingRules, "example.org", true},
<mask> {"blocking", blockingRules, "test.example.org", true},
<mask> {"blocking", blockingRules, "test.test.example.org", true},
<mask> {"blocking", blockingRules, "testexample.org", false},
<mask> {"blocking", blockingRules, "onemoreexample.org", false},
<mask> {"whitelist", whitelistRules, "example.org", true},
<mask> {"whitelist", whitelistRules, "test.example.org", false},
<mask> {"whitelist", whitelistRules, "test.test.example.org", false},
<mask> {"whitelist", whitelistRules, "testexample.org", false},
<mask> {"whitelist", whitelistRules, "onemoreexample.org", false},
<mask> {"important", importantRules, "example.org", false},
<mask> {"important", importantRules, "test.example.org", true},
<mask> {"important", importantRules, "test.test.example.org", true},
<mask> {"important", importantRules, "testexample.org", false},
<mask> {"important", importantRules, "onemoreexample.org", false},
<mask> {"regex", regexRules, "example.org", true},
<mask> {"regex", regexRules, "test.example.org", false},
<mask> {"regex", regexRules, "test.test.example.org", false},
<mask> {"regex", regexRules, "testexample.org", true},
<mask> {"regex", regexRules, "onemoreexample.org", true},
<mask> {"mask", maskRules, "test.example.org", true},
<mask> {"mask", maskRules, "test2.example.org", true},
<mask> {"mask", maskRules, "example.com", true},
<mask> {"mask", maskRules, "exampleeee.com", true},
<mask> {"mask", maskRules, "onemoreexamsite.com", true},
<mask> {"mask", maskRules, "example.org", false},
<mask> {"mask", maskRules, "testexample.org", false},
<mask> {"mask", maskRules, "example.co.uk", false},
<mask> }
<mask>
<mask> func TestMatching(t *testing.T) {
<mask> for _, test := range tests {
<mask> t.Run(fmt.Sprintf("%s-%s", test.testname, test.hostname), func(t *testing.T) {
</s> dnsfilter -- Update tests to check for expected filter/nofilter reason as well. </s> remove testname string
rules []string
hostname string
result bool
</s> add testname string
rules []string
hostname string
isFiltered bool
reason Reason </s> remove if ret.IsFiltered != test.result {
t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret, test.result)
</s> add if ret.IsFiltered != test.isFiltered {
t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret.IsFiltered, test.isFiltered)
}
if ret.Reason != test.reason {
t.Errorf("Hostname %s has wrong reason (%v must be %v)", test.hostname, ret.Reason.String(), test.reason.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1102963fa09bb5708dfd9bff9449ffd303a47701 | dnsfilter/dnsfilter_test.go |
if ret.IsFiltered != test.isFiltered {
t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret.IsFiltered, test.isFiltered)
}
if ret.Reason != test.reason {
t.Errorf("Hostname %s has wrong reason (%v must be %v)", test.hostname, ret.Reason.String(), test.reason.String()) | <mask> ret, err := d.CheckHost(test.hostname)
<mask> if err != nil {
<mask> t.Errorf("Error while matching host %s: %s", test.hostname, err)
<mask> }
<mask> if ret.IsFiltered != test.result {
<mask> t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret, test.result)
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
</s> dnsfilter -- Update tests to check for expected filter/nofilter reason as well. </s> remove {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true},
{"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false},
{"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false},
{"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false},
{"blocking", blockingRules, "example.org", true},
{"blocking", blockingRules, "test.example.org", true},
{"blocking", blockingRules, "test.test.example.org", true},
{"blocking", blockingRules, "testexample.org", false},
{"blocking", blockingRules, "onemoreexample.org", false},
{"whitelist", whitelistRules, "example.org", true},
{"whitelist", whitelistRules, "test.example.org", false},
{"whitelist", whitelistRules, "test.test.example.org", false},
{"whitelist", whitelistRules, "testexample.org", false},
{"whitelist", whitelistRules, "onemoreexample.org", false},
{"important", importantRules, "example.org", false},
{"important", importantRules, "test.example.org", true},
{"important", importantRules, "test.test.example.org", true},
{"important", importantRules, "testexample.org", false},
{"important", importantRules, "onemoreexample.org", false},
{"regex", regexRules, "example.org", true},
{"regex", regexRules, "test.example.org", false},
{"regex", regexRules, "test.test.example.org", false},
{"regex", regexRules, "testexample.org", true},
{"regex", regexRules, "onemoreexample.org", true},
{"mask", maskRules, "test.example.org", true},
{"mask", maskRules, "test2.example.org", true},
{"mask", maskRules, "example.com", true},
{"mask", maskRules, "exampleeee.com", true},
{"mask", maskRules, "onemoreexamsite.com", true},
{"mask", maskRules, "example.org", false},
{"mask", maskRules, "testexample.org", false},
{"mask", maskRules, "example.co.uk", false},
</s> add {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true, FilteredBlackList},
{"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false, NotFilteredNotFound},
{"blocking", blockingRules, "example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "testexample.org", false, NotFilteredNotFound},
{"blocking", blockingRules, "onemoreexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "example.org", true, FilteredBlackList},
{"whitelist", whitelistRules, "test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "test.test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "testexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "onemoreexample.org", false, NotFilteredNotFound},
{"important", importantRules, "example.org", false, NotFilteredWhiteList},
{"important", importantRules, "test.example.org", true, FilteredBlackList},
{"important", importantRules, "test.test.example.org", true, FilteredBlackList},
{"important", importantRules, "testexample.org", false, NotFilteredNotFound},
{"important", importantRules, "onemoreexample.org", false, NotFilteredNotFound},
{"regex", regexRules, "example.org", true, FilteredBlackList},
{"regex", regexRules, "test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "test.test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "testexample.org", true, FilteredBlackList},
{"regex", regexRules, "onemoreexample.org", true, FilteredBlackList},
{"mask", maskRules, "test.example.org", true, FilteredBlackList},
{"mask", maskRules, "test2.example.org", true, FilteredBlackList},
{"mask", maskRules, "example.com", true, FilteredBlackList},
{"mask", maskRules, "exampleeee.com", true, FilteredBlackList},
{"mask", maskRules, "onemoreexamsite.com", true, FilteredBlackList},
{"mask", maskRules, "example.org", false, NotFilteredNotFound},
{"mask", maskRules, "testexample.org", false, NotFilteredNotFound},
{"mask", maskRules, "example.co.uk", false, NotFilteredNotFound}, </s> remove testname string
rules []string
hostname string
result bool
</s> add testname string
rules []string
hostname string
isFiltered bool
reason Reason | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/1102963fa09bb5708dfd9bff9449ffd303a47701 | dnsfilter/dnsfilter_test.go |
"strings" | <mask> "net/url"
<mask> "strconv"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/golibs/jsonutil"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "golang.org/x/net/idna"
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
"golang.org/x/net/idna" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/golibs/jsonutil"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> type qlogConfig struct {
<mask> Enabled bool `json:"enabled"`
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | <mask> return false
<mask> }
<mask>
<mask> // parseSearchCriterion parses a search criterion from the query parameter.
<mask> func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
<mask> val := q.Get(name)
<mask> if len(val) == 0 {
<mask> return false, searchCriterion{}, nil
<mask> }
<mask>
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) | <mask>
<mask> // parseSearchCriterion parses a search criterion from the query parameter.
<mask> func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
<mask> val := q.Get(name)
<mask> if len(val) == 0 {
<mask> return false, searchCriterion{}, nil
<mask> }
<mask>
<mask> c := searchCriterion{
<mask> criterionType: ct,
<mask> value: val,
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
sc = searchCriterion{ | <mask> if len(val) == 0 {
<mask> return false, searchCriterion{}, nil
<mask> }
<mask>
<mask> c := searchCriterion{
<mask> criterionType: ct,
<mask> value: val,
<mask> }
<mask> if getDoubleQuotesEnclosedValue(&c.value) {
<mask> c.strict = true
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
asciiVal: asciiVal,
strict: strict, | <mask>
<mask> c := searchCriterion{
<mask> criterionType: ct,
<mask> value: val,
<mask> }
<mask> if getDoubleQuotesEnclosedValue(&c.value) {
<mask> c.strict = true
<mask> }
<mask>
<mask> if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
<mask> return false, c, fmt.Errorf("invalid value %s", c.value)
<mask> }
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
return true, sc, nil | <mask> if getDoubleQuotesEnclosedValue(&c.value) {
<mask> c.strict = true
<mask> }
<mask>
<mask> if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
<mask> return false, c, fmt.Errorf("invalid value %s", c.value)
<mask> }
<mask>
<mask> return true, c, nil
<mask> }
<mask>
<mask> // parseSearchParams - parses "searchParams" from the HTTP request's query string
<mask> func (l *queryLog) parseSearchParams(r *http.Request) (p *searchParams, err error) {
<mask> p = newSearchParams()
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { | <mask> // and scan all log records until we found enough log entries
<mask> p.maxFileScanEntries = 0
<mask> }
<mask>
<mask> paramNames := map[string]criterionType{
<mask> "search": ctTerm,
<mask> "response_status": ctFilteringStatus,
<mask> }
<mask>
<mask> for k, v := range paramNames {
<mask> var ok bool
<mask> var c searchCriterion
<mask> ok, c, err = l.parseSearchCriterion(q, k, v)
<mask> if err != nil {
<mask> return nil, err
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) | <mask>
<mask> for k, v := range paramNames {
<mask> var ok bool
<mask> var c searchCriterion
<mask> ok, c, err = l.parseSearchCriterion(q, k, v)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if ok {
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
// ctTerm is for searching by the domain name, the client's IP address,
// the client's ID or the client's name. The domain name search
// supports IDNAs. | <mask>
<mask> type criterionType int
<mask>
<mask> const (
<mask> // ctTerm is for searching by the domain name, the client's IP
<mask> // address, the client's ID or the client's name.
<mask> //
<mask> // TODO(e.burkov): Make it support IDNA while #3012.
<mask> ctTerm criterionType = iota
<mask> // ctFilteringStatus is for searching by the filtering status.
<mask> //
<mask> // See (*searchCriterion).ctFilteringStatusCase for details.
<mask> ctFilteringStatus
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
asciiVal string | <mask>
<mask> // searchCriterion is a search criterion that is used to match a record.
<mask> type searchCriterion struct {
<mask> value string
<mask> criterionType criterionType
<mask> // strict, if true, means that the criterion must be applied to the
<mask> // whole value rather than the part of it. That is, equality and not
<mask> // containment.
<mask> strict bool
<mask> }
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove // ctTerm is for searching by the domain name, the client's IP
// address, the client's ID or the client's name.
//
// TODO(e.burkov): Make it support IDNA while #3012.
</s> add // ctTerm is for searching by the domain name, the client's IP address,
// the client's ID or the client's name. The domain name search
// supports IDNAs. </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
func ctDomainOrClientCaseStrict( | <mask> // containment.
<mask> strict bool
<mask> }
<mask>
<mask> func (c *searchCriterion) ctDomainOrClientCaseStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
asciiTerm string, | <mask> func ctDomainOrClientCaseStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
<mask> ) (ok bool) {
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
(asciiTerm != "" && strings.EqualFold(host, asciiTerm)) || | <mask> host string,
<mask> ip string,
<mask> ) (ok bool) {
<mask> return strings.EqualFold(host, term) ||
<mask> strings.EqualFold(clientID, term) ||
<mask> strings.EqualFold(ip, term) ||
<mask> strings.EqualFold(name, term)
<mask> }
<mask>
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
func ctDomainOrClientCaseNonStrict( | <mask>
<mask> return false
<mask> }
<mask>
<mask> func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
asciiTerm string, | <mask> }
<mask>
<mask> func ctDomainOrClientCaseNonStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
<mask> ) (ok bool) {
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
(asciiTerm != "" && containsFold(host, asciiTerm)) || | <mask> ) (ok bool) {
<mask> return containsFold(clientID, term) ||
<mask> containsFold(host, term) ||
<mask> containsFold(ip, term) ||
<mask> containsFold(name, term)
<mask> }
<mask>
<mask> // quickMatch quickly checks if the line matches the given search criterion.
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) | <mask> name = cli.Name
<mask> }
<mask>
<mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
<mask> case ctFilteringStatus:
<mask> // Go on, as we currently don't do quick matches against
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove term := strings.ToLower(c.value)
</s> add </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
return ctDomainOrClientCaseNonStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) | <mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
<mask> case ctFilteringStatus:
<mask> // Go on, as we currently don't do quick matches against
<mask> // filtering statuses.
<mask> return true
<mask> default:
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove term := strings.ToLower(c.value)
</s> add </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
<mask> name = e.client.Name
<mask> }
<mask>
<mask> ip := e.IP.String()
<mask> term := strings.ToLower(c.value)
<mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
|
return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) | <mask>
<mask> ip := e.IP.String()
<mask> term := strings.ToLower(c.value)
<mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
<mask> }
<mask>
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove term := strings.ToLower(c.value)
</s> add </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) | <mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
<mask> }
<mask>
<mask> func (c *searchCriterion) ctFilteringStatusCase(res filtering.Result) bool {
<mask> switch c.value {
<mask> case filteringStatusAll:
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove term := strings.ToLower(c.value)
</s> add </s> remove return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
// 1. Run "sudo ipset create example_set hash:ip family ipv4". | <mask> )
<mask>
<mask> // How to test on a real Linux machine:
<mask> //
<mask> // 1. Run:
<mask> //
<mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
// 2. Run "sudo ipset list example_set". The Members field should be empty. | <mask> // How to test on a real Linux machine:
<mask> //
<mask> // 1. Run:
<mask> //
<mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
// 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. | <mask> // 1. Run:
<mask> //
<mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
// 4. Start AdGuardHome. | <mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
// 5. Make requests to example.com and its subdomains. | <mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> //
<mask> // 4. Start AdGuardHome.
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
// 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. | <mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> //
<mask> // 4. Start AdGuardHome.
<mask> //
<mask> // 5. Make requests to example.com and its subdomains.
<mask> //
<mask> // 6. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should contain the resolved IP addresses.
<mask>
<mask> // newIpsetMgr returns a new Linux ipset manager.
<mask> func newIpsetMgr(ipsetConf []string) (set IpsetManager, err error) {
<mask> return newIpsetMgrWithDialer(ipsetConf, defaultDial)
<mask> }
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 | <mask> github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8
<mask> github.com/kisielk/errcheck v1.6.2
<mask> github.com/kyoh86/looppointer v0.1.7
<mask> github.com/securego/gosec/v2 v2.13.1
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05
<mask> honnef.co/go/tools v0.3.3
<mask> mvdan.cc/gofumpt v0.3.1
<mask> mvdan.cc/unparam v0.0.0-20220831102321-2fc90a84c7ec
<mask> )
<mask>
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.mod |
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect | <mask> github.com/gookit/color v1.5.2 // indirect
<mask> github.com/kyoh86/nolint v0.0.1 // indirect
<mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.mod |
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect | <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> )
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.mod |
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect | <mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> )
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.mod |
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= | <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk=
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | <mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= | <mask> golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
<mask> golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
<mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release' | <mask> ---
<mask> 'version': 2
<mask> 'plan':
<mask> 'project-key': 'AGH'
<mask> 'key': 'AGHBSNAPSPECS'
<mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests'
</s> add 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' | [
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' | <mask> 'key': 'AGHBSNAPSPECS'
<mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release'
</s> add 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release' </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test'
</s> add - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test' </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
- 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' | <mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Build frontend'
<mask>
<mask> - 'Make release':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Make release'
<mask>
<mask> - 'Make and publish docker':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Make and publish docker'
<mask>
<mask> - 'Publish to static storage':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Publish to static storage'
<mask>
<mask> - 'Publish to GitHub Releases':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Publish to GitHub Releases'
<mask>
<mask> 'Build frontend':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test'
</s> add - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test' </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' | <mask> 'jobs':
<mask> - 'Publish to GitHub Releases'
<mask>
<mask> 'Build frontend':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
<mask> '${system.YARN_DIR}': '${bamboo.cacheYarn}'
<mask> 'key': 'BF'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> # Explicitly checkout the revision that we need.
<mask> git checkout "${bamboo.repository.revision.number}"
<mask>
<mask> make js-deps js-build
<mask> 'artifacts':
<mask> - 'name': 'AdGuardHome frontend'
<mask> 'pattern': 'build*/**'
<mask> 'shared': true
<mask> 'required': true
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Make release':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Make release':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
<mask> '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
<mask> '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
<mask> 'key': 'MR'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> # Explicitly checkout the revision that we need.
<mask> git checkout "${bamboo.repository.revision.number}"
<mask>
<mask> # Run the build with the specified channel.
<mask> echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
<mask> | awk '{ gsub(/\\n/, "\n"); print; }'\
<mask> | gpg --import --batch --yes
<mask>
<mask> make\
<mask> CHANNEL=${bamboo.channel}\
<mask> GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
<mask> FRONTEND_PREBUILT=1\
<mask> PARALLELISM=1\
<mask> VERBOSE=2\
<mask> build-release
<mask> # TODO(a.garipov): Use more fine-grained artifact rules.
<mask> 'artifacts':
<mask> - 'name': 'AdGuardHome dists'
<mask> 'pattern': 'dist/**'
<mask> 'shared': true
<mask> 'required': true
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Make and publish docker':
<mask> 'key': 'MPD'
<mask> 'other':
<mask> 'clean-working-dir': true
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Make and publish docker':
<mask> 'key': 'MPD'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> COMMIT="${bamboo.repository.revision.number}"
<mask> export COMMIT
<mask> readonly COMMIT
<mask>
<mask> # Explicitly checkout the revision that we need.
<mask> git checkout "$COMMIT"
<mask>
<mask> # Install Qemu, create builder.
<mask> docker version -f '{{ .Server.Experimental }}'
<mask> docker buildx rm buildx-builder || :
<mask> docker buildx create --name buildx-builder --driver docker-container\
<mask> --use
<mask> docker buildx inspect --bootstrap
<mask>
<mask> # Login to DockerHub.
<mask> docker login -u="${bamboo.dockerHubUsername}"\
<mask> -p="${bamboo.dockerHubPassword}"
<mask>
<mask> # Boot the builder.
<mask> docker buildx inspect --bootstrap
<mask>
<mask> # Print Docker info.
<mask> docker info
<mask>
<mask> # Prepare and push the build.
<mask> env\
<mask> CHANNEL="${bamboo.channel}"\
<mask> DIST_DIR='dist'\
<mask> DOCKER_IMAGE_NAME='adguard/adguardhome'\
<mask> DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
<mask> VERBOSE='1'\
<mask> sh ./scripts/make/build-docker.sh
<mask> 'environment':
<mask> DOCKER_CLI_EXPERIMENTAL=enabled
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to static storage':
<mask> 'key': 'PUB'
<mask> 'other':
<mask> 'clean-working-dir': true
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to static storage':
<mask> 'key': 'PUB'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'clean'
<mask> - 'checkout':
<mask> 'repository': 'bamboo-deploy-publisher'
<mask> 'path': 'bamboo-deploy-publisher'
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> cd ./dist/
<mask>
<mask> CHANNEL="${bamboo.channel}"
<mask> export CHANNEL
<mask>
<mask> ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to GitHub Releases':
<mask> 'key': 'PTGR'
<mask> 'other':
<mask> 'clean-working-dir': true
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to GitHub Releases':
<mask> 'key': 'PTGR'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'clean'
<mask> - 'checkout':
<mask> 'repository': 'bamboo-deploy-publisher'
<mask> 'path': 'bamboo-deploy-publisher'
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> channel="${bamboo.channel}"
<mask> readonly channel
<mask>
<mask> if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
<mask> then
<mask> echo "don't publish to GitHub Releases for this channel"
<mask>
<mask> exit 0
<mask> fi
<mask>
<mask> cd ./dist/
<mask>
<mask> env\
<mask> GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
<mask> ../bamboo-deploy-publisher/deploy.sh adguard-home-github
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'triggers':
<mask> # Don't use minute values that end with a zero or a five as these are often used
<mask> # in CI and so resources during these minutes can be quite busy.
<mask> - 'cron': '0 42 13 ? * MON-FRI *'
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
# Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'triggers':
<mask> # Don't use minute values that end with a zero or a five as these are often used
<mask> # in CI and so resources during these minutes can be quite busy.
<mask> - 'cron': '0 42 13 ? * MON-FRI *'
<mask> 'branches':
<mask> 'create': 'manually'
<mask> 'delete':
<mask> 'after-deleted-days': 1
<mask> 'after-inactive-days': 30
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true | <mask> # Don't use minute values that end with a zero or a five as these are often used
<mask> # in CI and so resources during these minutes can be quite busy.
<mask> - 'cron': '0 42 13 ? * MON-FRI *'
<mask> 'branches':
<mask> 'create': 'manually'
<mask> 'delete':
<mask> 'after-deleted-days': 1
<mask> 'after-inactive-days': 30
<mask> 'integration':
<mask> 'push-on-success': false
<mask> 'merge-from': 'AdGuard Home - Build and publish release'
<mask> 'link-to-jira': true
<mask>
<mask> 'notifications':
<mask> - 'events':
<mask> - 'plan-completed'
<mask> 'recipients':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
- 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' | <mask> 'merge-from': 'AdGuard Home - Build and publish release'
<mask> 'link-to-jira': true
<mask>
<mask> 'notifications':
<mask> - 'events':
<mask> - 'plan-completed'
<mask> 'recipients':
<mask> - 'webhook':
<mask> 'name': 'Build webhook'
<mask> 'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
<mask>
<mask> 'labels': []
<mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
<mask>
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
</s> add - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo' </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
'concurrent-build-plugin': 'system-default' | <mask> 'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
<mask>
<mask> 'labels': []
<mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
<mask>
<mask> 'branch-overrides':
<mask> # beta-vX.Y branches are the branches into which the commits that are needed to
<mask> # release a new patch version are initially cherry-picked.
<mask> - '^beta-v[0-9]+\.[0-9]+':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' </s> remove - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
</s> add - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo' </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
# beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' | <mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
<mask>
<mask> 'branch-overrides':
<mask> # beta-vX.Y branches are the branches into which the commits that are needed to
<mask> # release a new patch version are initially cherry-picked.
<mask> - '^beta-v[0-9]+\.[0-9]+':
<mask> # Build betas on release branches manually.
<mask> 'triggers': []
<mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
<mask> 'integration':
<mask> 'push-on-success': false
<mask> 'merge-from': 'beta-v0.107'
<mask> # Build final releases on release branches manually.
<mask> 'triggers': []
<mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release'
</s> add 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release' </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
<mask>
<mask> env\
<mask> VERBOSE='1'\
<mask> sh ./scripts/snap/build.sh
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to Snapstore':
<mask> 'artifact-subscriptions':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove set -e -f -u -x
</s> add set -e -f -u -x | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/snapcraft.yaml |
|
'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' | <mask> ---
<mask> 'version': 2
<mask> 'plan':
<mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Tests':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release'
</s> add 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release' </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test'
</s> add - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test' </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true | [
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.7' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests'
</s> add 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' </s> remove - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test'
</s> add - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test' </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release'
</s> add 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release' </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
- 'Tests':
'manual': false
'final': false
'jobs':
- 'Test' | <mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Test'
<mask>
<mask> 'Test':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh | <mask> 'jobs':
<mask> - 'Test'
<mask>
<mask> 'Test':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
<mask> '${system.YARN_DIR}': '${bamboo.cacheYarn}'
<mask> '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
<mask> '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
<mask> 'key': 'TEST'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> make VERBOSE=1 ci go-tools lint
<mask> 'final-tasks':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove set -e -f -u -x
</s> add set -e -f -u -x </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
set -e -f -u -x | <mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> make VERBOSE=1 ci go-tools lint
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | <mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> make VERBOSE=1 ci go-tools lint
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'branches':
<mask> 'create': 'for-pull-request'
<mask> 'delete':
<mask> 'after-deleted-days': 1
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove set -e -f -u -x
</s> add set -e -f -u -x </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'branches':
<mask> 'create': 'for-pull-request'
<mask> 'delete':
<mask> 'after-deleted-days': 1
<mask> 'after-inactive-days': 5
<mask> 'integration':
<mask> 'push-on-success': false
<mask> 'merge-from': 'AdGuard Home - Build and run tests'
<mask> 'link-to-jira': true
<mask>
<mask> 'notifications':
<mask> - 'events':
<mask> - 'plan-status-changed'
<mask> 'recipients':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
</s> add - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo' </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
- 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo' | <mask> 'merge-from': 'AdGuard Home - Build and run tests'
<mask> 'link-to-jira': true
<mask>
<mask> 'notifications':
<mask> - 'events':
<mask> - 'plan-status-changed'
<mask> 'recipients':
<mask> - 'webhook':
<mask> 'name': 'Build webhook'
<mask> 'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
<mask>
<mask> 'labels': []
<mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests'
</s> add 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
'concurrent-build-plugin': 'system-default' | <mask> 'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
<mask>
<mask> 'labels': []
<mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
</s> add - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo' </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
func newARPDB() (arp *cmdARPDB) { | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> )
<mask>
<mask> func newARPDB() *cmdARPDB {
<mask> return &cmdARPDB{
<mask> parse: parseArpA,
<mask> ns: &neighs{
<mask> mu: &sync.RWMutex{},
<mask> ns: make([]Neighbor, 0),
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove // Then, try "arp -a".
</s> add // Then, try "arp -a -n". | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_bsd.go |
Subsets and Splits