From 37ba85717f2e770a20ca8e2151cd6d4ee0d39d14 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Fri, 4 Oct 2024 22:54:11 +0200 Subject: [PATCH] Update build.yaml --- .github/workflows/build.yaml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 78dfe7a0..2d8bfb15 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -272,6 +272,9 @@ jobs: ## Prepare and create release ######################################################################################### prepare-release: + on: + release: + types: [released] runs-on: ubuntu-latest needs: [pack-for-update, pack-for-manual_setup, pack-for-remote_setup] if: startsWith(github.ref, 'refs/tags/') @@ -331,13 +334,11 @@ jobs: # extract the version used in next step - id: get_version - if: startsWith(github.ref, 'refs/tags/') - uses: Simply007/get-version-action@v2 + uses: dhkatz/get-version-action@v2 # # the changelog [unreleased] will now be changed to the release version # - name: Update changelog # uses: thomaseizinger/keep-a-changelog-new-release@v1 -# if: startsWith(github.ref, 'refs/tags/') # with: # changelogPath: Changelog.md # version: ${{ steps.get_version.outputs.version-without-v }} @@ -345,7 +346,6 @@ jobs: # # the release notes will be extracted from changelog # - name: Extract release notes # id: extract-release-notes -# if: startsWith(github.ref, 'refs/tags/') # uses: ffurrer2/extract-release-notes@v1 # with: # changelog_file: Changelog.md @@ -353,12 +353,11 @@ jobs: # Releases should only be created on master by tagging the last commit. # all artifacts in firmware folder pushed to the release - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2.0.8 # Note: # If you get the error "Resource not accessible by integration", # The access rights are not sufficient, see # https://github.com/softprops/action-gh-release/issues/232#issuecomment-1131379440 - if: startsWith(github.ref, 'refs/tags/') with: name: ${{ steps.get_version.outputs.version-without-v }} body: ${{ steps.extract-release-notes.outputs.release_notes }} @@ -367,7 +366,6 @@ jobs: # # Commit&Push Changelog to master branch. Must be manually merged back to rolling # - name: Commit changes and push changes -# if: startsWith(github.ref, 'refs/tags/') # run: | # git config user.name github-actions # git config user.email github-actions@github.com @@ -381,7 +379,7 @@ jobs: ######################################################################################### # Make sure to also update update-webinstaller.yml! update-web-installer: - if: startsWith(github.ref, 'refs/tags/v') # Only run on a release + if: "!github.event.release.prerelease" # Only run on release but not on prerelease needs: [prepare-release] environment: name: github-pages @@ -400,7 +398,7 @@ jobs: - name: Get version of last release id: last_release - uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321 + uses: mindojo/get-latest-release@00b8ef1434d7468d6bffcc8263baff5c777f72321 with: myToken: ${{ github.token }} exclude_types: "draft|prerelease"