Commit graph

41 commits

Author SHA1 Message Date
Ainar Garipov
5f6fbe8e08 all: sync with master; upd chlog 2023-01-19 15:04:46 +03:00
Ainar Garipov
a11c8e91ab all: sync with master 2022-12-15 17:50:08 +03:00
Ainar Garipov
fde9ea5cb1 all: sync with master 2022-12-07 16:46:59 +03:00
Ainar Garipov
c9314610d4 all: sync with master 2022-11-02 16:18:02 +03:00
Ainar Garipov
16755c37d8 all: upd go 2022-10-07 15:57:26 +03:00
Ainar Garipov
faf2b32389 all: sync with master 2022-09-07 18:03:18 +03:00
Ainar Garipov
7bb9b2416b cherry-pick: upd-specs
Merge in DNS/adguard-home from upd-specs to master

Squashed commit of the following:

commit d7ac1dc1ef305098ff741d557c13db8a60ffe1f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 15 19:16:51 2022 +0300

    bamboo-specs: allow larger keys
2022-08-17 18:15:16 +03:00
Eugene Burkov
2de321ce24 cherry-pick: Fix frontend CI build
Merge in DNS/adguard-home from fix-bamboo-specs to master

Squashed commit of the following:

commit e59b75ab9528bbe8fbf5e15054d848abffbae312
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Aug 15 18:52:10 2022 +0300

    all: fix ci frontend build
2022-08-17 18:14:59 +03:00
Eugene Burkov
30b2b85ff1 cherry-pick: Separate front- and back- end builds
Merge in DNS/adguard-home from imp-bamboo-specs to master

Squashed commit of the following:

commit 3415b650e48aefef3ad16030be3d797de4015403
Merge: e37c0a2b f58265ec
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Aug 15 18:42:42 2022 +0300

    Merge branch 'master' into imp-bamboo-specs

commit e37c0a2bb52fab98e133332e8f54d500d0f96b06
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 15 18:30:33 2022 +0300

    scripts: replace find with loop

commit 826a02f6a11000cce4b3205229d6bbb050c8dd73
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Aug 15 18:00:41 2022 +0300

    all: ...again

commit 54aebf5d4aeba35e3dc320436236759f4d1ccdad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Aug 15 17:59:24 2022 +0300

    all: fix spec yaml

commit 87b92b30504f2427c40303265354afba4855e0bb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Aug 15 17:48:19 2022 +0300

    all: separate front- and back-end builds
2022-08-17 18:14:44 +03:00
Ainar Garipov
8166c4bc33 cherry-pick: upd-go
Merge in DNS/adguard-home from upd-go to master

Squashed commit of the following:

commit 8edfb5cc3466c1e4ee2eacae5157bd93c135a284
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Aug 3 14:25:45 2022 +0300

    all: imp docs; fmt

commit 080b8a85c02afbdaa079c0da47cb7b6311d50fbe
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 2 20:51:20 2022 +0300

    all: upd go, imp generic code
2022-08-03 16:01:02 +03:00
Ainar Garipov
af4ff5c748 cherry-pick: upd-domains-and-links
Merge in DNS/adguard-home from upd-domains-and-links to master

Squashed commit of the following:

commit 5e5ff2fec358104995877da689da24749ac470ce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jul 28 19:53:19 2022 +0300

    all: upd urls

    Update domains and URLs to make them more resistant to state blocking.
2022-08-03 15:54:23 +03:00
Ainar Garipov
49cdef3d6a all: upd chlog, go 2022-07-13 14:46:30 +03:00
Ainar Garipov
6a0ef2df15 all: upd chlog, go 2022-04-13 14:30:17 +03:00
Dimitry Kolyshev
d021a67d66 cherry-pick: upd bamboo-specs snapcraft
Merge in DNS/adguard-home from upd-bamboo-spec to master

Squashed commit of the following:

commit c26c70f97cbce98afd5c7d4241188d6949869c2a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Apr 8 13:51:23 2022 +0200

    upd bamboo-specs snapcraft

commit afe40c03b70d2b2dff9c7c25044d7924bdd3c765
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Apr 8 13:10:38 2022 +0200

    upd bamboo-specs snapcraft
2022-04-12 21:09:04 +03:00
Ainar Garipov
d17c6c6bb3 all: upd go, chlog, tools 2022-04-06 18:27:21 +03:00
Ainar Garipov
52bc1b3f10 all: upd go, chlog 2022-03-04 15:38:59 +03:00
Ainar Garipov
5ebcbfa9ad all: upd go 2022-02-11 16:27:53 +03:00
Ainar Garipov
952d5f3a3d all: fix release script 2021-12-29 19:20:26 +03:00
Ainar Garipov
8f9053e2fc all: backport, prepare release 2021-12-29 16:09:01 +03:00
Ainar Garipov
b44c755d25 cherry-pick: all: upd dnsproxy
Updates #3977.

Squashed commit of the following:

commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 23 16:15:11 2021 +0300

    all: upd dnsproxy
2021-12-24 22:41:05 +03:00
Ainar Garipov
86cffcd168 Pull request: all: upd go, minor imp
Merge in DNS/adguard-home from minor-imp to master

Squashed commit of the following:

commit c5b9e2a15290760b2782acc0c08df3fe57356500
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 10 14:23:28 2021 +0300

    all: upd go, minor imp
2021-12-10 17:20:15 +03:00
Ainar Garipov
adec2c998b Pull request: all: upd golang-ubuntu image version
Merge in DNS/adguard-home from upd-golang-ubuntu to master

Squashed commit of the following:

commit 67874bad7e018d6d17dc4f000aef79a5a430b994
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Oct 11 15:32:39 2021 +0300

    all: upd golang-ubuntu image version
2021-10-11 15:56:22 +03:00
Ainar Garipov
4684c8e4ed Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master

Squashed commit of the following:

commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jul 14 12:04:59 2021 +0300

    bamboo-specs: upd go
2021-07-14 12:43:11 +03:00
Ainar Garipov
dab7b439d1 Pull request: all: imp docs, names
Merge in DNS/adguard-home from imp-text to master

Squashed commit of the following:

commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jun 11 17:09:00 2021 +0300

    all: imp docs, names
2021-06-18 18:13:36 +03:00
Ainar Garipov
be4e110732 Pull request: all: imp new plat docs
Updates #2441.
Updates #2443.

Squashed commit of the following:

commit 6e5218916753bffb91f9fc6d5a546487add620d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 1 15:56:21 2021 +0300

    all: imp new plat docs
2021-06-01 16:04:22 +03:00
Ainar Garipov
c6888326b0 Pull request: all: update go and backend tools
Closes #2576.
Updates #2275.
Updates #2419.
Updates #2443.

Squashed commit of the following:

commit b1a4809ada298d675de12740051ba26fb9945957
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri May 21 14:01:40 2021 +0300

    all: add --local-frontend, upd docker

commit 619ee7c82f27e3405753003dbec556ffb056d025
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 20 15:02:33 2021 +0300

    bamboo-specs: bump docker version

commit 5c2b2fbce80afdcc81fd0cb83674dc3d64facbf1
Merge: 6536b32d 9c60aef6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 20 15:01:47 2021 +0300

    Merge branch 'master' into 2275-upd-go

commit 6536b32dd4580425f7dedde6765463a79b9bd699
Merge: 9bb32bc4 6f7fd33a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 19 20:38:48 2021 +0300

    Merge branch 'master' into 2275-upd-go

commit 9bb32bc4c0ac0f3a97195adc75359e48c9c58897
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 19 18:48:50 2021 +0300

    all: fix build, imp err handling

commit 6868eac7f7d2980fb706881f53e72afe5f7c3447
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 19 18:09:32 2021 +0300

    all: fix github lint

commit ebbb9c55f32fbd57e34e8b161016aa6b291c097c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 19 17:36:56 2021 +0300

    all: update go and backend tools
2021-05-21 14:55:42 +03:00
Ainar Garipov
6f7fd33afd Pull request: all: imp scripts
Merge in DNS/adguard-home from imp-sh to master

Squashed commit of the following:

commit 477832e11eca2ef7ac0071b5da938dacb2ed617d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 19 20:24:34 2021 +0300

    scripts: rm dbg

commit dbb4b8c783f607781b980dcd57d78085c9022e72
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 19 20:21:20 2021 +0300

    all: imp code, compat, docs

commit e6e4375d67ad1c213efb04411e3ba0bc6293f936
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 19 19:33:48 2021 +0300

    all: imp scripts
2021-05-19 20:31:20 +03:00
Ainar Garipov
1b789b5f81 Pull request: dnsforward: exclude docker dns
Updates #3064.

Squashed commit of the following:

commit 2cfeb830853dffcb26968d0a4d21b623f00da275
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 13 14:02:08 2021 +0300

    all: imp code, expose pprof port

commit a22656a3fd24253f7327eff5168ea84391c8d758
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 13 13:34:05 2021 +0300

    all: imp code, dockerfile

commit 35e2145fe061d0d803b46578539499ecfe9d3ea4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 13 12:34:09 2021 +0300

    dnsforward: exclude docker dns
2021-05-13 14:30:40 +03:00
Ainar Garipov
9846eeb1d8 Pull request: bamboo-specs: add missing vars
Merge in DNS/adguard-home from specs-vars to master

Squashed commit of the following:

commit 25f50e4b8c98edf6a3bd161f62bdf5db49202358
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 30 15:12:28 2021 +0300

    bamboo-specs: add missing vars
2021-04-30 15:17:03 +03:00
Ainar Garipov
29e61290ec Pull request: bamboo-specs: configure release branches
Merge in DNS/adguard-home from specs-branch to master

Squashed commit of the following:

commit 20819ce0d4fc090c3a49d316115b3173300babc4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 30 14:52:54 2021 +0300

    bamboo-specs: configure release branches
2021-04-30 15:07:40 +03:00
Ainar Garipov
5b8081169e Pull request: bamboo-specs: add initial support for release branches
Merge in DNS/adguard-home from release-branches to master

Squashed commit of the following:

commit 1041589d63bb7192c31161ab92f6825ff11063b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 28 18:51:36 2021 +0300

    bamboo-specs: add initial support for release branches
2021-04-28 19:14:06 +03:00
Ainar Garipov
c9c2a79a55 Pull request: bamboo-specs: fix cron
Merge in DNS/adguard-home from labor-code-2 to master

Squashed commit of the following:

commit e69df9f5f1cfa9d2b2593810d4bf4a1e6a7f97d6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 15:28:54 2021 +0300

    bamboo-specs: fix cron
2021-04-21 15:35:58 +03:00
Ainar Garipov
34c87ea709 Pull request: bamboo-specs: no dailies on weekends
Merge in DNS/adguard-home from labor-code to master

Squashed commit of the following:

commit 0e283c60830c66162ff2482eebf2d544139a3eb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 15:14:32 2021 +0300

    bamboo-specs: no dailies on weekends
2021-04-21 15:24:53 +03:00
Ainar Garipov
c82080e1a7 Pull request: clear working directory after each build to prevent agent's disk bloat
Merge in DNS/adguard-home from clean-working-directory to master

Squashed commit of the following:

commit cf5908c8bff984544f6d6fcad5bcd0b8e2109225
Author: Константин Замякин <sc@adguard.com>
Date:   Wed Apr 14 02:06:20 2021 +0300

    clear working directory after each build to prevent agent's disk bloat
2021-04-14 12:40:48 +03:00
Ainar Garipov
7d8f01b88a Pull request: bamboo-specs: fix notification url
Merge in DNS/adguard-home from bamboo-fix to master

Squashed commit of the following:

commit 8b04bcc350a196cf1a4e98c559b41e9e262ce539
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:23:33 2021 +0300

    bamboo-specs: fix notification url
2021-04-13 17:35:58 +03:00
Ainar Garipov
0247a2da44 Pull request: all: imp shell code
Merge in DNS/adguard-home from imp-sh to master

Squashed commit of the following:

commit 212f03f3d6e0824428c28ffd79cac8f5ea271d9c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 9 14:51:59 2021 +0300

    all: imp shell code
2021-04-09 15:07:18 +03:00
Ainar Garipov
8c7f2b77d5 Pull request: bamboo-specs: push the docker image
Merge in DNS/adguard-home from spec-docker-push to master

Squashed commit of the following:

commit 73c76cf61463e2982911b8407ca368da5a9e8133
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 18:19:27 2021 +0300

    bamboo-specs: push the docker image
2021-04-08 18:24:42 +03:00
Ainar Garipov
1a214eaabc Pull request: bamboo-specs: use our docker image in snap stage
Merge in DNS/adguard-home from spec-snap-docker to master

Squashed commit of the following:

commit 2a43d33ba712152b0322f2e7ecdf1167c34d3435
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 17:51:07 2021 +0300

    bamboo-specs: use our docker image in snap stage
2021-04-08 17:56:27 +03:00
Ainar Garipov
1e3fc990eb Pull request: all: fix specs, imp docs
Merge in DNS/adguard-home from fix-specs-2 to master

Squashed commit of the following:

commit 687c5ead52ba4939ea89405a9a326c23e72c502b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 16:38:34 2021 +0300

    all: fix specs, imp docs
2021-04-08 16:44:01 +03:00
Ainar Garipov
c5f4d0ce44 Pull request: bamboo-specs: cd into dist
Merge in DNS/adguard-home from fix-specs to master

Squashed commit of the following:

commit 4a46f6f417e3a82c3adc819dc5428125f97bd747
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 16:20:16 2021 +0300

    bamboo-specs: cd into dist
2021-04-08 16:24:59 +03:00
Ainar Garipov
1c87dc577d Pull request: all: add bamboo specs
Merge in DNS/adguard-home from add-specs to master

Squashed commit of the following:

commit 011f9ae643e84b9bcd407cba5d86c586a73f7366
Merge: 856364fb 80ed8be1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 20:20:32 2021 +0300

    Merge branch 'master' into add-specs

commit 856364fb55901f977b6e25fa3cd90be5f680d3ad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 14:35:00 2021 +0300

    all: fix awk invocation

commit 202a04f5dd0860c094c887d7fdb71e6424a6d0ce
Merge: cdd95cfa 00a61fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 20:49:05 2021 +0300

    Merge branch 'master' into add-specs

commit cdd95cfa4e6be74acd4d15a2908504e9e27f29d8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 18:03:55 2021 +0300

    all: fix specs

commit fe2a3017f5c88d429ca6f962dee293338d55919f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:30:45 2021 +0300

    all: use the correct gpg key

commit a28eff00f7a98a078e34c2b16e887c05364b6087
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:14:28 2021 +0300

    all: imp Makefile, specs

commit 6faa3c0687387e4fd60433d326a99da01dd21b02
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 16:50:41 2021 +0300

    all: add bamboo specs
2021-04-08 13:55:12 +03:00