Skip to content

Commit

Permalink
fix tag must be pushed before release
Browse files Browse the repository at this point in the history
  • Loading branch information
kurtharriger committed May 19, 2024
1 parent 9de6605 commit 87d123a
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions .github/workflows/ci-build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,26 @@ jobs:
path: target/clj-mergetool${{ matrix.os == 'windows-latest' && '.exe' || '' }}
if-no-files-found: error

release:
push-changes:
if: github.ref == 'refs/heads/main'
needs: build
runs-on: ubuntu-latest

steps:
- name: Download updated code
uses: actions/download-artifact@v4
with:
name: updated-code

- name: Push changes
run: |
git push origin main --tags
release:
if: github.ref == 'refs/heads/main'
needs: push-changes
runs-on: ubuntu-latest

steps:
- name: Download build artifacts for Linux amd64
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -153,7 +168,6 @@ jobs:
path: RELEASE_NOTES.md

- name: Create Release
if: github.ref == 'refs/heads/main'
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
Expand All @@ -166,19 +180,3 @@ jobs:
target/clj-mergetool-macos-arm64
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

push-changes:
if: github.ref == 'refs/heads/main'
needs: release
runs-on: ubuntu-latest

steps:
- name: Download updated code
uses: actions/download-artifact@v4
with:
name: updated-code

- name: Push changes
if: github.ref == 'refs/heads/main'
run: |
git push origin main

0 comments on commit 87d123a

Please sign in to comment.