Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updating to macos-14 #1486

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

updating to macos-14 #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
894a10c
updating to macos-14
dhchandw Nov 20, 2024
dcefb14
using 7zip from node modules
dhchandw Nov 22, 2024
f593771
fix
dhchandw Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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=$(npx 7za l ./dist/zap-win-x64.zip)
expression=zap-cli
if [[ $output == *"$expression"* ]]; then
echo "Output contains $expression"
Expand All @@ -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=$(npx 7za l ./dist/zap-win-arm64.zip)
expression=zap-cli
if [[ $output == *"$expression"* ]]; then
echo "Output contains $expression"
Expand All @@ -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=$(npx 7za l ./dist/zap-mac-x64.zip | grep zap-cli)
expression=zap-cli
if [[ $output == *"$expression"* ]]; then
echo "Output contains $expression"
Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
if: startsWith(matrix.os, 'macos')
uses: GuillaumeFalourd/[email protected]
with:
command_line: ./node_modules/7zip-bin/mac/x64/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')
Expand All @@ -362,7 +362,7 @@ jobs:
if: startsWith(matrix.os, 'macos')
uses: GuillaumeFalourd/[email protected]
with:
command_line: ./node_modules/7zip-bin/mac/x64/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')
Expand All @@ -375,7 +375,7 @@ jobs:
if: startsWith(matrix.os, 'macos')
uses: GuillaumeFalourd/[email protected]
with:
command_line: ./node_modules/7zip-bin/mac/x64/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')
Expand All @@ -387,7 +387,7 @@ jobs:
if: startsWith(matrix.os, 'macos')
uses: GuillaumeFalourd/[email protected]
with:
command_line: ./node_modules/7zip-bin/mac/x64/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')
Expand Down
2 changes: 1 addition & 1 deletion src-script/install-packages-osx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading