From dc88866d85a3c2d8a45388a33be5a8a87e1f8d6f Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Wed, 19 Nov 2025 14:52:25 -0500 Subject: [PATCH 1/2] ci: ensure `--config` is always passed with `cmake --install` lol Signed-off-by: Seth Flynn --- .github/actions/package/macos/action.yml | 2 +- .github/actions/package/windows/action.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/package/macos/action.yml b/.github/actions/package/macos/action.yml index cecd9d797..e85ffa07c 100644 --- a/.github/actions/package/macos/action.yml +++ b/.github/actions/package/macos/action.yml @@ -59,7 +59,7 @@ runs: BUILD_DIR: build INSTALL_DIR: install run: | - cmake --install ${{ env.BUILD_DIR }} + cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} cd ${{ env.INSTALL_DIR }} chmod +x "PrismLauncher.app/Contents/MacOS/prismlauncher" diff --git a/.github/actions/package/windows/action.yml b/.github/actions/package/windows/action.yml index d86a51809..09d39f121 100644 --- a/.github/actions/package/windows/action.yml +++ b/.github/actions/package/windows/action.yml @@ -36,7 +36,7 @@ runs: BUILD_DIR: build INSTALL_DIR: install run: | - cmake --install ${{ env.BUILD_DIR }} + cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} touch ${{ env.INSTALL_DIR }}/manifest.txt for l in $(find ${{ env.INSTALL_DIR }} -type f); do l=$(cygpath -u $l); l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_DIR }}/}; l=${l#./}; echo $l; done >> ${{ env.INSTALL_DIR }}/manifest.txt @@ -102,7 +102,7 @@ runs: INSTALL_PORTABLE_DIR: install-portable run: | cp -r ${{ env.INSTALL_DIR }} ${{ env.INSTALL_PORTABLE_DIR }} # cmake install on Windows is slow, let's just copy instead - cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable + cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable for l in $(find ${{ env.INSTALL_PORTABLE_DIR }} -type f); do l=$(cygpath -u $l); l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_PORTABLE_DIR }}/}; l=${l#./}; echo $l; done >> ${{ env.INSTALL_PORTABLE_DIR }}/manifest.txt - name: Package (MSVC, portable) @@ -114,7 +114,7 @@ runs: INSTALL_PORTABLE_DIR: install-portable run: | cp -r ${{ env.INSTALL_DIR }} ${{ env.INSTALL_PORTABLE_DIR }} # cmake install on Windows is slow, let's just copy instead - cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable + cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable Get-ChildItem ${{ env.INSTALL_PORTABLE_DIR }} -Recurse | ForEach FullName | Resolve-Path -Relative | %{ $_.TrimStart('.\') } | %{ $_.TrimStart('${{ env.INSTALL_PORTABLE_DIR }}') } | %{ $_.TrimStart('\') } | Out-File -FilePath ${{ env.INSTALL_DIR }}/manifest.txt From 6a46484895872e66f1292363d962eda5d307feea Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Wed, 19 Nov 2025 14:53:37 -0500 Subject: [PATCH 2/2] ci: fix macos code signing secret names oopsie Signed-off-by: Seth Flynn --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d68efac9..696311033 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -199,13 +199,13 @@ jobs: build-type: ${{ steps.setup-dependencies.outputs.build-type }} artifact-name: ${{ matrix.artifact-name }} - apple-codesign-cert: ${{ secrets.APPLE-CODESIGN-CERT }} - apple-codesign-password: ${{ secrets.APPLE-CODESIGN_PASSWORD }} - apple-codesign-id: ${{ secrets.APPLE-CODESIGN_ID }} + apple-codesign-cert: ${{ secrets.APPLE_CODESIGN_CERT }} + apple-codesign-password: ${{ secrets.APPLE_CODESIGN_PASSWORD }} + apple-codesign-id: ${{ secrets.APPLE_CODESIGN_ID }} apple-notarize-apple-id: ${{ secrets.APPLE_NOTARIZE_APPLE_ID }} apple-notarize-team-id: ${{ secrets.APPLE_NOTARIZE_TEAM_ID }} - apple-notarize-password: ${{ secrets.APPLE-NOTARIZE_PASSWORD }} - sparkle-ed25519-key: ${{ secrets.SPARKLE-ED25519_KEY }} + apple-notarize-password: ${{ secrets.APPLE_NOTARIZE_PASSWORD }} + sparkle-ed25519-key: ${{ secrets.SPARKLE_ED25519_KEY }} - name: Package (Windows) if: ${{ runner.os == 'Windows' }}