From 55a9ffa3a75fa7ace709da82b0330ddd0e75f168 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Sat, 11 Apr 2026 18:50:30 +0200 Subject: [PATCH] no-bug: Fix signmar path --- .github/workflows/build.yml | 7 +------ .github/workflows/linux-release-build.yml | 6 +++--- .github/workflows/windows-release-build.yml | 10 +--------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00e8d76f1..7b94e7b0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -505,14 +505,9 @@ jobs: run: | git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object --depth 1 - - name: Download signmar-linux-x86_64 from artifacts - uses: actions/download-artifact@v4 - with: - name: signmar-linux-x86_64 - - name: Sign MAR files env: - SIGNMAR: ${{ github.workspace }}/signmar-linux-x86_64/signmar + SIGNMAR: ${{ github.workspace }}/linux-bin-x86_64/bin/signmar ZEN_MAR_SIGNING_PASSWORD: ${{ secrets.ZEN_MAR_SIGNING_PASSWORD }} ZEN_SIGNING_CERT_PEM_BASE64: ${{ secrets.ZEN_SIGNING_CERT_PEM_BASE64 }} ZEN_SIGNING_PRIVATE_KEY_PEM_BASE64: ${{ secrets.ZEN_SIGNING_PRIVATE_KEY_PEM_BASE64 }} diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 2ce7906cc..2fba0e880 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -174,10 +174,10 @@ jobs: name: linux_update_manifest_${{ matrix.arch }} path: ./dist/update - - name: Upload signmar + - name: Upload linux bin if: ${{ matrix.arch == 'x86_64' }} uses: actions/upload-artifact@v4 with: retention-days: 2 - name: signmar-linux-x86_64 - path: engine/obj-x86_64-pc-linux-gnu/dist/bin/signmar + name: linux-bin-x86_64 + path: engine/obj-x86_64-pc-linux-gnu/dist/bin/ diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index a7260a733..10c1da6d3 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -285,7 +285,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }} with: - retention-days: 5 + retention-days: 2 name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-${{ inputs.profile-data-path-archive }} path: ./zen.win64-pgo-stage-1.zip @@ -312,14 +312,6 @@ jobs: name: windows-x64-obj-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }} path: obj-${{ matrix.arch }}-pc-windows-msvc - - name: Upload artifact (if Twilight branch, binary) - if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }} - uses: actions/upload-artifact@v4 - with: - retention-days: 5 - name: zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip - path: ./zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip - - name: Upload artifact (if Twilight branch, installer) if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }} uses: actions/upload-artifact@v4