Skip to content

Commit 1c34daf

Browse files
committed
Added encrypted keystore #DEPLOY #RELEASE
1 parent a524607 commit 1c34daf

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

.circleci/keystore.enc

5.45 KB
Binary file not shown.

scripts/config.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ GITHUB_RELEASE_DESC="This release was automatically generated by the CI server"
1414
GITHUB_RELEASE_URL="https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases"
1515
GITHUB_RELEASE_TOKEN=$ANDROID_NETWORK_TOOLS_GITHUB_RELEASE_TOKEN
1616

17+
GIT_COMMIT_DESC=`git log -n 1 $CIRCLE_SHA1`
18+
GIT_CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
19+
1720
# Fires a webhook to slack to notify of successful upload to beta
1821
function webhook {
1922

scripts/decrypt-secrets.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010

1111
# Decrypt
1212
openssl aes-256-cbc -d -in .circleci/key.p12.enc -out key.p12 -k $ANDROID_NETWORK_TOOLS_DECRYPTKEY1
13+
openssl aes-256-cbc -d -in .circleci/keystore.enc -out keystore -k $ANDROID_NETWORK_TOOLS_DECRYPTKEY2

scripts/github-release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ function create_github_release {
2424
if [[ $GIT_COMMIT_DESC == *"#RELEASE"* ]]; then
2525
echo "Creating github release"
2626
if create_github_release $GITHUB_RELEASE_MODULE; then
27-
webhook "${1}" "Created github release"
27+
webhook $GITHUB_RELEASE_MODULE "Created github release"
2828
else
29-
webhook "${1}" "Failed to create github release :("
29+
webhook $GITHUB_RELEASE_MODULE "Failed to create github release :("
3030
fi
3131
fi

scripts/upload-apks.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ function upload_to_google_play {
3636
# fi
3737

3838

39-
GIT_COMMIT_DESC=`git log -n 1 $CIRCLE_SHA1`
40-
GIT_CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
41-
4239
# Print the git commit message
4340
echo "Git commit message: ${GIT_COMMIT_DESC}"
4441

0 commit comments

Comments
 (0)