diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 0b5c86e46..b3c5a58ef 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -19,12 +19,6 @@ jobs: - name: Create Version Branch run: | git switch -c version_bump_${{ github.event.inputs.version_number }} - git push -u origin version_bump_${{ github.event.inputs.version_number }} - - - name: Checkout Version Branch - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 - with: - ref: version_bump_${{ github.event.inputs.version_number }} - name: Bump Version - Android XML uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 @@ -56,16 +50,32 @@ jobs: version: ${{ github.event.inputs.version_number }} file_path: "./src/iOS/Info.plist" - - name: Commit files + - name: Setup git run: | git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" + + - name: Check if version changed + id: version-changed + run: | + if [ -n "$(git status --porcelain)" ]; then + echo "::set-output name=changes_to_commit::TRUE" + else + echo "::set-output name=changes_to_commit::FALSE" + echo "No changes to commit!"; + fi + + - name: Commit files + if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} + run: | git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a - name: Push changes + if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} run: git push -u origin version_bump_${{ github.event.inputs.version_number }} - name: Create Version PR + if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} env: PR_BRANCH: "version_bump_${{ github.event.inputs.version_number }}" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"