Skip to content

Commit 6ac294c

Browse files
author
Oleg Labudko
committed
Pull request: Update specs
Merge in EXTENSIONS/vpn-extension from update_specs to master Squashed commit of the following: commit 3a2868b Author: tvinzz <[email protected]> Date: Mon Jul 18 13:45:33 2022 +0300 updated deploy and tests specs commit ffba774 Author: tvinzz <[email protected]> Date: Mon Jul 18 13:30:18 2022 +0300 increased MAX_BUILD_TIME for exclusions tree test commit 8928ac9 Author: tvinzz <[email protected]> Date: Mon Jul 18 13:27:05 2022 +0300 fixed logs order
1 parent 63107c2 commit 6ac294c

File tree

7 files changed

+13
-1
lines changed

7 files changed

+13
-1
lines changed

bamboo-specs/build-beta.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Build:
3535
- |-
3636
set -x
3737
set -e
38+
# Fix mixed logs
39+
exec 2>&1
3840
ls -alt
3941
4042
yarn install ${bamboo.varsYarn}

bamboo-specs/build-release.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Build:
2929
- |-
3030
set -x
3131
set -e
32+
# Fix mixed logs
33+
exec 2>&1
3234
ls -alt
3335
3436
yarn install ${bamboo.varsYarn}

bamboo-specs/deploy-beta.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Chrome WebStore:
3131
- |-
3232
set -x
3333
set -e
34+
# Fix mixed logs
35+
exec 2>&1
3436
ls -la
3537
3638
./bamboo-deploy-publisher/deploy.sh adguard-vpn-webstore-beta

bamboo-specs/deploy-release.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ Addons Mozilla:
3939
#!/bin/bash
4040
set -x
4141
set -e
42+
# Fix mixed logs
43+
exec 2>&1
4244
ls -la
4345
4446
EXTENSIONS_PASSPHRASE="${bamboo.extensionsPassphrase}" ./bamboo-deploy-publisher/deploy.sh adguard-vpn-amo

bamboo-specs/increment.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Increment:
3131
- |-
3232
set -x
3333
set -e
34+
# Fix mixed logs
35+
exec 2>&1
3436
ls -alt
3537
3638
yarn increment

bamboo-specs/tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Test:
3131
- |-
3232
set -e
3333
set -x
34+
# Fix mixed logs
35+
exec 2>&1
3436
3537
yarn install ${bamboo.varsYarn}
3638
yarn lint

tests/background/exclusions/ExclusionsTree.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ describe('ExclusionsTree', () => {
203203
ExclusionsTree was generated in: ${average} ms
204204
On MacBook Pro (15-inch, 2019), with 2,6 GHz 6-Core Intel Core i7 and 16 GB 2400 MHz DDR4 is built in ~30-40ms
205205
`);
206-
const MAX_BUILD_TIME = 100;
206+
const MAX_BUILD_TIME = 150;
207207
expect(average).toBeLessThan(MAX_BUILD_TIME);
208208
});
209209
});

0 commit comments

Comments
 (0)