From 0aba57c0ee0d4ee309a053d50310e0de5869e670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20M=C3=BCller?= Date: Wed, 27 Nov 2024 17:29:06 +0100 Subject: [PATCH] ci: correctly trigger jobs --- .github/workflows/deploy_github.yml | 2 ++ .../deploy_github_signed_windows.yml | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy_github.yml b/.github/workflows/deploy_github.yml index 4202039..5d1261f 100644 --- a/.github/workflows/deploy_github.yml +++ b/.github/workflows/deploy_github.yml @@ -53,6 +53,8 @@ jobs: prerelease: false body: | ![](https://img.shields.io/github/downloads/AFM-analysis/PyJibe/${{ env.RELEASE_VERSION }}/total.svg) + + For signed installers, please read the [Code Signing Policy](https://pyjibe.readthedocs.io/en/stable/code_signing.html). files: | ./build-recipes/dist/*.dmg ./build-recipes/dist/*.pkg diff --git a/.github/workflows/deploy_github_signed_windows.yml b/.github/workflows/deploy_github_signed_windows.yml index 4c2c410..aa8ab08 100644 --- a/.github/workflows/deploy_github_signed_windows.yml +++ b/.github/workflows/deploy_github_signed_windows.yml @@ -1,10 +1,9 @@ name: Deploy Signed Windows Installer to GitHub Releases on: - workflow_run: - workflows: [Deploy to GitHub Releases] - types: - - completed + push: + tags: + - '*' env: PYINSTALLER_COMPILE_BOOTLOADER: 1 @@ -58,8 +57,9 @@ jobs: wait-for-completion: true output-artifact-directory: 'build-recipes/dist/PyJibe' parameters: | - Version: ${{ toJSON(env.RELEASE_VERSION) }} - Release_Tag: env.RELEASE_VERSION + # must be JSON, but we cannot nest env in a `toJSON` call + Version: '"${{ env.RELEASE_VERSION }}"' + Release_Tag: ${{ env.RELEASE_VERSION }} - name: Create Windows installer working-directory: ./build-recipes run: | @@ -86,8 +86,9 @@ jobs: wait-for-completion: true output-artifact-directory: 'build-recipes/Output' parameters: | - Version: ${{ toJSON(env.RELEASE_VERSION) }} - Release_Tag: env.RELEASE_VERSION + # must be JSON, but we cannot nest env in a `toJSON` call + Version: '"${{ env.RELEASE_VERSION }}"' + Release_Tag: ${{ env.RELEASE_VERSION }} - name: Rename windows installer to signed shell: bash run: | @@ -99,8 +100,6 @@ jobs: name: PyJibe ${{ env.RELEASE_VERSION }} draft: true prerelease: false - append_body: | - For signed installers, please read the [Code Signing Policy](https://pyjibe.readthedocs.io/en/stable/code_signing.html). files: | ./build-recipes/dist/*.dmg ./build-recipes/dist/*.pkg