diff --git a/.beta-build b/.beta-build new file mode 100644 index 00000000..abb380e4 --- /dev/null +++ b/.beta-build @@ -0,0 +1 @@ +2942 diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index ed8f4791..bb648250 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -4,6 +4,8 @@ on: push: branches: - 'master' + paths: + - '.beta-build' env: APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }} @@ -22,16 +24,8 @@ env: CHANGELOG_PREFACE: ${{ secrets.CHANGELOG_PREFACE }} jobs: - check_beta: - if: contains(github.event.head_commit.message, 'Attempt beta release') - runs-on: ubuntu-latest - steps: - - name: Check beta commit - run: | - echo build_upload_ios: runs-on: macos-11 - needs: check_beta timeout-minutes: 60 steps: - uses: actions/checkout@v2 @@ -49,7 +43,6 @@ jobs: bundle exec fastlane --env ios,beta store_beta build_upload_mac: runs-on: macos-11 - needs: check_beta timeout-minutes: 60 steps: - uses: actions/checkout@v2 diff --git a/scripts/commit-beta.sh b/scripts/commit-beta.sh index 1b708ad6..27d0aa1a 100755 --- a/scripts/commit-beta.sh +++ b/scripts/commit-beta.sh @@ -7,8 +7,10 @@ fi # set build number . .env +MARKER_FILE=".beta-build" BUILD=$((BASE_BUILD_NUMBER + `git rev-list HEAD --count` + 1)) ci/set-build.sh $BUILD +echo $BUILD >$MARKER_FILE # set release notes ci/update-release-notes.sh ios && @@ -21,6 +23,7 @@ git -C PassepartoutCore/Sources/PassepartoutCore/API pull origin master git add */PassepartoutCore/API # add build number +git add $MARKER_FILE git add Passepartout.xcodeproj git add *.plist