From 894a10c86ba6f9e89e8475782bdb0fb255799f7a Mon Sep 17 00:00:00 2001 From: Dhruv Chandwani Date: Wed, 20 Nov 2024 11:26:01 -0500 Subject: [PATCH 1/3] updating to macos-14 --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fdf285b19..78c3c0d244 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -148,7 +148,7 @@ jobs: # Platforms to build on/for strategy: matrix: - os: [macos-12, ubuntu-22.04] + os: [macos-14, ubuntu-22.04] fail-fast: false steps: @@ -261,7 +261,7 @@ jobs: - name: Verify zap-cli exists in Windows x64 .zip package if: startsWith(matrix.os, 'macos') run: | - output=$(./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-x64.zip) + output=$(7za l ./dist/zap-win-x64.zip) expression=zap-cli if [[ $output == *"$expression"* ]]; then echo "Output contains $expression" @@ -272,7 +272,7 @@ jobs: - name: Verify zap-cli exists in Windows arm64 .zip package if: startsWith(matrix.os, 'macos') run: | - output=$(./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-arm64.zip) + output=$(7za l ./dist/zap-win-arm64.zip) expression=zap-cli if [[ $output == *"$expression"* ]]; then echo "Output contains $expression" @@ -283,7 +283,7 @@ jobs: - name: Verify zap-cli exists in macOS x64 .zip package if: startsWith(matrix.os, 'macos') run: | - output=$(./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-mac-x64.zip | grep zap-cli) + output=$(7za l ./dist/zap-mac-x64.zip | grep zap-cli) expression=zap-cli if [[ $output == *"$expression"* ]]; then echo "Output contains $expression" @@ -350,7 +350,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-x64.zip | grep apack.json + command_line: 7za l ./dist/zap-win-x64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in Windows x64 .zip package's app.asar archive if: startsWith(matrix.os, 'macos') @@ -362,7 +362,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-arm64.zip | grep apack.json + command_line: 7za l ./dist/zap-win-arm64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in Windows arm64 .zip package's app.asar archive if: startsWith(matrix.os, 'macos') @@ -375,7 +375,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-mac-x64.zip | grep apack.json + command_line: 7za l ./dist/zap-mac-x64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in macOS x64 .zip package's app-x64.asar archive if: startsWith(matrix.os, 'macos') @@ -387,7 +387,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-mac-arm64.zip | grep apack.json + command_line: 7za l ./dist/zap-mac-arm64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in macOS arm64 .zip package's app-arm64.asar archive if: startsWith(matrix.os, 'macos') From dcefb14c600126a7fa1ccf477762938a789b734f Mon Sep 17 00:00:00 2001 From: Dhruv Chandwani Date: Fri, 22 Nov 2024 15:52:15 -0500 Subject: [PATCH 2/3] using 7zip from node modules --- .github/workflows/release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78c3c0d244..8f83ca9f46 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -261,7 +261,7 @@ jobs: - name: Verify zap-cli exists in Windows x64 .zip package if: startsWith(matrix.os, 'macos') run: | - output=$(7za l ./dist/zap-win-x64.zip) + output=$(npx 7za l ./dist/zap-win-x64.zip) expression=zap-cli if [[ $output == *"$expression"* ]]; then echo "Output contains $expression" @@ -272,7 +272,7 @@ jobs: - name: Verify zap-cli exists in Windows arm64 .zip package if: startsWith(matrix.os, 'macos') run: | - output=$(7za l ./dist/zap-win-arm64.zip) + output=$(npx 7za l ./dist/zap-win-arm64.zip) expression=zap-cli if [[ $output == *"$expression"* ]]; then echo "Output contains $expression" @@ -283,7 +283,7 @@ jobs: - name: Verify zap-cli exists in macOS x64 .zip package if: startsWith(matrix.os, 'macos') run: | - output=$(7za l ./dist/zap-mac-x64.zip | grep zap-cli) + output=$(npx 7za l ./dist/zap-mac-x64.zip | grep zap-cli) expression=zap-cli if [[ $output == *"$expression"* ]]; then echo "Output contains $expression" @@ -350,7 +350,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: 7za l ./dist/zap-win-x64.zip | grep apack.json + command_line: npx 7za l ./dist/zap-win-x64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in Windows x64 .zip package's app.asar archive if: startsWith(matrix.os, 'macos') @@ -362,7 +362,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: 7za l ./dist/zap-win-arm64.zip | grep apack.json + command_line: npx 7za l ./dist/zap-win-arm64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in Windows arm64 .zip package's app.asar archive if: startsWith(matrix.os, 'macos') @@ -375,7 +375,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: 7za l ./dist/zap-mac-x64.zip | grep apack.json + command_line: npx 7za l ./dist/zap-mac-x64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in macOS x64 .zip package's app-x64.asar archive if: startsWith(matrix.os, 'macos') @@ -387,7 +387,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: GuillaumeFalourd/assert-command-line-output@v2.1 with: - command_line: 7za l ./dist/zap-mac-arm64.zip | grep apack.json + command_line: npx 7za l ./dist/zap-mac-arm64.zip | grep apack.json contains: 'apack.json' - name: Verify apack.json exists in macOS arm64 .zip package's app-arm64.asar archive if: startsWith(matrix.os, 'macos') From f59377126b71e8e648db59047cee66feba8359af Mon Sep 17 00:00:00 2001 From: Dhruv Chandwani Date: Fri, 22 Nov 2024 17:08:29 -0500 Subject: [PATCH 3/3] fix --- src-script/install-packages-osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-script/install-packages-osx b/src-script/install-packages-osx index 07bfa01f92..27b1a99efa 100755 --- a/src-script/install-packages-osx +++ b/src-script/install-packages-osx @@ -2,4 +2,4 @@ # # Packages you have to install on macOS to get source build to compile via npm install. # -brew install pkg-config cairo pango libpng jpeg giflib librsvg +brew install cairo pango libpng jpeg giflib librsvg