Skip to content

Commit

Permalink
Cancel jobs if no tag is present, also cancel previous runs when anot…
Browse files Browse the repository at this point in the history
…her happens
  • Loading branch information
adriangl committed Aug 19, 2020
1 parent 46185e9 commit 5799474
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 9 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/generate_daily_snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ jobs:
name: Generate daily snapshot from develop
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.4.1
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Set-up JDK 1.8
uses: actions/setup-java@v1
with:
Expand All @@ -22,12 +26,20 @@ jobs:
- name: Fetch tags
run: git fetch origin +refs/tags/*:refs/tags/*
- name: Verify if no version has been generated from this commit
id: verify_generate_version
run: |
# --exact-match is needed in case the current commit is not tagged
if [ ! -z $(git describe --abbrev=0 --tags --exact-match HEAD 2> /dev/null) ]; then
if [ ! -z $(git describe --abbrev=0 --tags --exact-match HEAD 2> /dev/null) ];
then
echo "The commit already has a tag, exiting..."
exit -1
echo ::set-output name=generate_version::0 # saved as output of the step
else
echo "The commit doesn't have a tag, keep going..."
echo ::set-output name=generate_version::1 # saved as output of the step
fi
- name: Cancel job if no version needs to be generated
if: ${{ steps.verify_generate_version.outputs.generate_version == 0 }}
uses: andymckay/cancel-action@0.2
- name: Dump keystore from secret
id: dump_keystore
env:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/generate_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ jobs:
name: Generate release candidate from master
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.4.1
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Set-up JDK 1.8
uses: actions/setup-java@v1
with:
Expand All @@ -28,6 +32,21 @@ jobs:
echo "The commit already has a tag, exiting..."
exit -1
fi
- name: Verify if no version has been generated from this commit
id: verify_generate_version
run: |
# --exact-match is needed in case the current commit is not tagged
if [ ! -z $(git describe --abbrev=0 --tags --exact-match HEAD 2> /dev/null) ];
then
echo "The commit already has a tag, exiting..."
echo ::set-output name=generate_version::0 # saved as output of the step
else
echo "The commit doesn't have a tag, keep going..."
echo ::set-output name=generate_version::1 # saved as output of the step
fi
- name: Cancel job if no version needs to be generated
if: ${{ steps.verify_generate_version.outputs.generate_version == 0 }}
uses: andymckay/cancel-action@0.2
- name: Dump keystore from secret
id: dump_keystore
env:
Expand Down
14 changes: 7 additions & 7 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
Expand Down Expand Up @@ -138,11 +138,11 @@
<orderEntry type="module-library">
<library name="Gradle: kaptGeneratedClasses">
<CLASSES>
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/releaseUnitTest" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down

0 comments on commit 5799474

Please sign in to comment.