From 260a7cd84dc6d26d50213dbe3aada0c05a991589 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 10 Jan 2025 17:44:19 +0100 Subject: [PATCH 1/5] Update pull_request.yml --- .github/workflows/pull_request.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 53caf7fb9..c3302d2f2 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -52,7 +52,9 @@ jobs: - name: Setup Ant uses: cedx/setup-ant@v3 - name: Install Certificates for Code Signing - if: ${{ matrix.os_prefix == 'macos' }} + env: + cert_secret: ${{ secrets.CERTIFICATES_P12 }} + if: ${{ matrix.os_prefix == 'macos' && secrets.CERTIFICATES_P12 != '' }} uses: apple-actions/import-codesign-certs@v3 with: p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} @@ -60,7 +62,7 @@ jobs: - name: Build Release run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ github.sha }}" env: - PROCESSING_APP_SIGNING: true + PROCESSING_APP_SIGNING: secrets.CERTIFICATES_P12 != '' - name: Add artifact uses: actions/upload-artifact@v3 id: upload @@ -68,10 +70,3 @@ jobs: name: processing-${{github.sha}}${{ matrix.os_prefix }}-${{ matrix.arch }} path: ./build/${{ matrix.os_prefix }}/processing-${{github.sha}}-${{ matrix.os_prefix}}-* retention-days: 5 - # TODO: Merge into one comment and fix the link - # - uses: mshick/add-pr-comment@v2 - # with: - # message-id: "build-artifact ${{ matrix.os_prefix }} ${{ matrix.arch }}" - # message: | - # Build artifacts for ${{ matrix.os_prefix }} (${{ matrix.arch }}) have been created. - # Download the artifacts [here](${{ steps.upload.outputs.artifact-id }}). From e350766ca34cc7affcb8cd99d9143d477405364b Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 10 Jan 2025 17:45:10 +0100 Subject: [PATCH 2/5] Update pull_request.yml --- .github/workflows/pull_request.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c3302d2f2..17da60627 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -52,8 +52,6 @@ jobs: - name: Setup Ant uses: cedx/setup-ant@v3 - name: Install Certificates for Code Signing - env: - cert_secret: ${{ secrets.CERTIFICATES_P12 }} if: ${{ matrix.os_prefix == 'macos' && secrets.CERTIFICATES_P12 != '' }} uses: apple-actions/import-codesign-certs@v3 with: From 6c47ebe9a2f416b44754fd10481646efbe6bb2d4 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 10 Jan 2025 17:47:28 +0100 Subject: [PATCH 3/5] Update pull_request.yml --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 17da60627..d020a1b1c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -60,7 +60,7 @@ jobs: - name: Build Release run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ github.sha }}" env: - PROCESSING_APP_SIGNING: secrets.CERTIFICATES_P12 != '' + PROCESSING_APP_SIGNING: ${{ secrets.CERTIFICATES_P12 != '' }} - name: Add artifact uses: actions/upload-artifact@v3 id: upload From e524ed2fc6b049f070dbc37aeccbe322cb892366 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 10 Jan 2025 17:48:49 +0100 Subject: [PATCH 4/5] Update pull_request.yml --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d020a1b1c..26c77dcdc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -52,7 +52,7 @@ jobs: - name: Setup Ant uses: cedx/setup-ant@v3 - name: Install Certificates for Code Signing - if: ${{ matrix.os_prefix == 'macos' && secrets.CERTIFICATES_P12 != '' }} + if: ${{ matrix.os_prefix == 'macos' && github.secrets.CERTIFICATES_P12 != '' }} uses: apple-actions/import-codesign-certs@v3 with: p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} From 1248d453e841067d22f540c1f540d6f972a1910a Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 10 Jan 2025 18:32:00 +0100 Subject: [PATCH 5/5] Update pull_request.yml --- .github/workflows/pull_request.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 26c77dcdc..b26436602 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -51,16 +51,16 @@ jobs: architecture: ${{ matrix.arch }} - name: Setup Ant uses: cedx/setup-ant@v3 - - name: Install Certificates for Code Signing - if: ${{ matrix.os_prefix == 'macos' && github.secrets.CERTIFICATES_P12 != '' }} - uses: apple-actions/import-codesign-certs@v3 - with: - p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} - p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} + # - name: Install Certificates for Code Signing + # if: ${{ matrix.os_prefix == 'macos' }} + # uses: apple-actions/import-codesign-certs@v3 + # with: + # p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} + # p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} - name: Build Release run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ github.sha }}" - env: - PROCESSING_APP_SIGNING: ${{ secrets.CERTIFICATES_P12 != '' }} + # env: + # PROCESSING_APP_SIGNING: ${{ secrets.CERTIFICATES_P12 != '' }} - name: Add artifact uses: actions/upload-artifact@v3 id: upload