Skip to content

Commit 3499793

Browse files
committed
Merge branch 'develop' into alpha
2 parents 0044e38 + 88521ad commit 3499793

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ Temporary Items
3030
!.vscode/extensions.json
3131

3232
test/tests-exe-dir
33-
advancedrestclient.pfx
34-
arc-mac-certs.p12
35-
certs.tar
3633
web_modules
37-
.env
34+
secrets/
35+
secrets.tar

certs.tar.enc

-28.5 KB
Binary file not shown.

secrets.tar.enc

20 KB
Binary file not shown.

tasks/arc-publish.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ if [ $TRAVIS_BRANCH != 'alpha' ] && [ $TRAVIS_BRANCH != 'master' ] && [ $TRAVIS_
33
exit 0
44
fi
55

6-
echo "Decrypting signing keys..."
7-
openssl aes-256-cbc -K $encrypted_cb8606543db7_key -iv $encrypted_cb8606543db7_iv -in certs.tar.enc -out certs.tar -d
8-
echo "Extracting certificates to certs/..."
9-
tar xvf certs.tar
10-
echo "Copying certificate files to main directory..."
11-
cp certs/advancedrestclient.pfx .
12-
cp certs/arc-mac-certs.p12 .
6+
# Fails the build when the publishing process fails.
7+
set -e
138

14-
echo "Decrypting .env file..."
15-
openssl aes-256-cbc -K $encrypted_cb8606543db7_key -iv $encrypted_cb8606543db7_iv -in .env.enc -out .env -d
9+
echo "Decrypting secrets..."
10+
openssl aes-256-cbc -K $encrypted_2038aea4e984_key -iv $encrypted_2038aea4e984_iv -in secrets.tar.enc -out secrets.tar -d
11+
12+
echo "Extracting secrets..."
13+
tar xvf secrets.tar
14+
15+
echo "Copying .env file..."
16+
cp secrets/.env .
1617

1718
export CSC_NAME="Pawel Psztyc"
18-
export WIN_CSC_LINK="advancedrestclient.pfx"
19-
export CSC_LINK="arc-mac-certs.p12"
19+
export WIN_CSC_LINK="secrets/advancedrestclient.pfx"
20+
export CSC_LINK="secrets/arc-mac-certs.p12"
2021

2122
if [ -f "$WIN_CSC_LINK" ]; then
2223
echo "Windows sign key ready."

tasks/pack-secrets.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# This file is to remember how to create secrets.tar file. All secrets MUST be encoded in a single tar file.
2+
# These files are required to build and sign ARC app.
3+
tar cvf secrets.tar secrets/.env secrets/advancedrestclient.pfx secrets/arc-mac-certs.p12
4+
travis encrypt-file secrets.tar

0 commit comments

Comments
 (0)