Skip to content

Commit

Permalink
Pull request: all: upd chlog, bamboo
Browse files Browse the repository at this point in the history
Merge in DNS/adguard-home from upd-chlog to master

Squashed commit of the following:

commit 2607bd4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 29 20:26:16 2021 +0300

    all: fmt chlog

commit fc379e3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 29 20:24:16 2021 +0300

    all: upd chlog, bamboo
  • Loading branch information
ainar-g committed Dec 29, 2021
1 parent a6ca824 commit 01947be
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 15 deletions.
44 changes: 29 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,35 @@ and this project adheres to

- `windows/arm64` support ([#3057]).

### Changed

- The validation error message for duplicated allow- and blocklists in DNS
settings now shows the duplicated elements ([#3975]).

### Deprecated

<!--
TODO(a.garipov): Remove this deprecation, if v0.108.0 is released before
the Go 1.18 release.
TODO(a.garipov): Remove this deprecation, if v0.108.0 is released before the Go
1.18 release.
-->
- Go 1.17 support. v0.109.0 will require at least Go 1.18 to build.

### Removed

- Go 1.16 support.

[#3057]: https://github.com/AdguardTeam/AdGuardHome/issues/3057



<!--
## [v0.107.2] - 2021-01-19 (APPROX.)
-->



## [v0.107.1] - 2021-12-29

### Changed

- The validation error message for duplicated allow- and blocklists in DNS
settings now shows the duplicated elements ([#3975]).

### Fixed

- `ipset` initialization bugs ([#4027]).
Expand All @@ -42,15 +58,12 @@ and this project adheres to
- Legacy DNS rewrites responding from upstream when a request other than `A` or
`AAAA` is received ([#4008]).
- Panic on port availability check during installation ([#3987]).
- Incorrect application of rules from the OS's hosts files ([#3998]).

### Removed

- Go 1.16 support.

[#3057]: https://github.com/AdguardTeam/AdGuardHome/issues/3057
[#3868]: https://github.com/AdguardTeam/AdGuardHome/issues/3868
[#3975]: https://github.com/AdguardTeam/AdGuardHome/issues/3975
[#3987]: https://github.com/AdguardTeam/AdGuardHome/issues/3987
[#3998]: https://github.com/AdguardTeam/AdGuardHome/issues/3998
[#4008]: https://github.com/AdguardTeam/AdGuardHome/issues/4008
[#4016]: https://github.com/AdguardTeam/AdGuardHome/issues/4016
[#4027]: https://github.com/AdguardTeam/AdGuardHome/issues/4027
Expand Down Expand Up @@ -657,11 +670,12 @@ In this release, the schema version has changed from 10 to 12.


<!--
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.1...HEAD
[v0.107.1]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.0...v0.107.1
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.2...HEAD
[v0.107.2]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.1...v0.107.2
-->

[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.0...HEAD
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.1...HEAD
[v0.107.1]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.0...v0.107.1
[v0.107.0]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.3...v0.107.0
[v0.106.3]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.2...v0.106.3
[v0.106.2]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.1...v0.106.2
Expand Down
5 changes: 5 additions & 0 deletions bamboo-specs/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@
# 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
Expand Down

0 comments on commit 01947be

Please sign in to comment.