File tree Expand file tree Collapse file tree 5 files changed +6
-5
lines changed Expand file tree Collapse file tree 5 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,9 @@ GITHUB_RELEASE_DESC="This release was automatically generated by the CI server"
14
14
GITHUB_RELEASE_URL=" https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases"
15
15
GITHUB_RELEASE_TOKEN=$ANDROID_NETWORK_TOOLS_GITHUB_RELEASE_TOKEN
16
16
17
+ GIT_COMMIT_DESC=` git log -n 1 $CIRCLE_SHA1 `
18
+ GIT_CURRENT_BRANCH=` git rev-parse --abbrev-ref HEAD`
19
+
17
20
# Fires a webhook to slack to notify of successful upload to beta
18
21
function webhook {
19
22
Original file line number Diff line number Diff line change 10
10
11
11
# Decrypt
12
12
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
Original file line number Diff line number Diff line change @@ -24,8 +24,8 @@ function create_github_release {
24
24
if [[ $GIT_COMMIT_DESC == * " #RELEASE" * ]]; then
25
25
echo " Creating github release"
26
26
if create_github_release $GITHUB_RELEASE_MODULE ; then
27
- webhook " ${1} " " Created github release"
27
+ webhook $GITHUB_RELEASE_MODULE " Created github release"
28
28
else
29
- webhook " ${1} " " Failed to create github release :("
29
+ webhook $GITHUB_RELEASE_MODULE " Failed to create github release :("
30
30
fi
31
31
fi
Original file line number Diff line number Diff line change @@ -36,9 +36,6 @@ function upload_to_google_play {
36
36
# fi
37
37
38
38
39
- GIT_COMMIT_DESC=` git log -n 1 $CIRCLE_SHA1 `
40
- GIT_CURRENT_BRANCH=` git rev-parse --abbrev-ref HEAD`
41
-
42
39
# Print the git commit message
43
40
echo " Git commit message: ${GIT_COMMIT_DESC} "
44
41
You can’t perform that action at this time.
0 commit comments