diff --git a/.github/workflows/linux-makepkg.yml b/.github/workflows/linux-makepkg.yml index d5eec3dd6..b53aa9e30 100644 --- a/.github/workflows/linux-makepkg.yml +++ b/.github/workflows/linux-makepkg.yml @@ -9,7 +9,7 @@ on: description: 'Version' required: false create-pr: - description: 'Create a PR for AUR mirror' + description: 'Create a PR for aur repo' type: boolean default: false push: @@ -81,7 +81,7 @@ jobs: cryptomator/dist/linux/makepkg/PKGBUILD.template create-pr: - name: Create PR for AUR + name: Create PR for aur repo if: github.event_name == 'workflow_dispatch' && inputs.create-pr || github.event_name == 'release' && needs.get-version.outputs.versionType == 'stable' runs-on: ubuntu-latest needs: [get-version, makepkg] @@ -141,6 +141,9 @@ jobs: fi echo "value=${NEXT_REL}" >> "$GITHUB_OUTPUT" + echo "dist-version=${VERSION}-${NEXT_REL}" >> "$GITHUB_OUTPUT" + env: + VERSION: ${{ needs.get-version.outputs.semVerStr }} - name: Download PKGBUILD template uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0 with: @@ -169,18 +172,18 @@ jobs: git config user.email "cryptobot@users.noreply.github.com" git config push.autoSetupRemote true git stage PKGBUILD .SRCINFO - git commit -m "Prepare release ${VERSION}" + git commit -m "Prepare release ${DIST_VERSION}" git push env: - VERSION: ${{ needs.get-version.outputs.semVerStr }}-${{ steps.pkgrel.outputs.value }} + DIST_VERSION: ${{ steps.pkgrel.outputs.dist-version }} - name: Create pull request id: create-pr run: | printf "Created by $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" > pr_body.md - PR_URL=$(gh pr create --title "Release $VERSION" --body-file pr_body.md) + PR_URL=$(gh pr create --title "Release $DIST_VERSION" --body-file pr_body.md) echo "url=$PR_URL" >> "$GITHUB_OUTPUT" env: - VERSION: ${{ needs.get-version.outputs.semVerStr }}-${{ steps.pkgrel.outputs.value }} + DIST_VERSION: ${{ steps.pkgrel.outputs.dist-version }} GH_TOKEN: ${{ secrets.CRYPTOBOT_PR_TOKEN }} - name: Slack Notification if: github.event_name == 'release' @@ -191,7 +194,7 @@ jobs: SLACK_ICON: false SLACK_ICON_EMOJI: ':bot:' SLACK_CHANNEL: 'cryptomator-desktop' - SLACK_TITLE: "AUR release PR created for ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}." + SLACK_TITLE: "AUR release PR created for ${{ github.event.repository.name }} ${{ steps.pkgrel.outputs.dist-version }} ." SLACK_MESSAGE: "See <${{ steps.create-pr.outputs.url }}|PR> on how to proceed." SLACK_FOOTER: false MSG_MINIMAL: true