Skip to content

Commit 04e935e

Browse files
authored
Merge pull request #704 from algorandfoundation/chore/update-mac-runner
chore: migrate from removed macos-13 intel agent to macos-15-intel
2 parents d2a0b2c + 2582b1d commit 04e935e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/build-binaries.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
strategy:
2020
matrix:
2121
# macos-14 is the Apple Silicon M1 runner (mac os 14)
22-
# macos-13 is the last available Intel Mac runner (mac os 13)
22+
# macos-15-intel is the last available Intel Mac runner (mac os 15)
2323
# See https://github.com/actions/runner-images?tab=readme-ov-file#available-images
24-
os: [ubuntu-22.04, windows-latest, macos-13, macos-14]
24+
os: [ubuntu-22.04, windows-latest, macos-15-intel, macos-14]
2525

2626
steps:
2727
- name: Set signing condition

tests/compile/test_typescript.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,22 @@ def typescript_test_dir(tmp_path_factory: pytest.TempPathFactory) -> Path:
6868
"name": "algokit-test",
6969
"version": "1.0.0",
7070
"dependencies": {
71-
"@algorandfoundation/puya-ts": "~1.0.0-beta.48 <1.0.0",
72-
"@algorandfoundation/algorand-typescript": "~1.0.0-beta.25 <1.0.0"
71+
"@algorandfoundation/puya-ts": "^1.0.1",
72+
"@algorandfoundation/algorand-typescript": "^1.0.1"
7373
}
7474
}"""
7575

7676
package_json_path = test_dir / "package.json"
7777
package_json_path.write_text(package_json_content)
7878

7979
# Execute npm install in the directory
80-
subprocess.run([_get_npm_command(), "install"], cwd=test_dir, check=True, capture_output=True, text=True)
80+
result = subprocess.run(
81+
[_get_npm_command(), "install", "--ignore-scripts"], cwd=test_dir, capture_output=True, text=True, check=False
82+
)
83+
if result.returncode != 0:
84+
raise RuntimeError(
85+
f"npm install failed with exit code {result.returncode}\nstdout: {result.stdout}\nstderr: {result.stderr}"
86+
)
8187

8288
return test_dir
8389

0 commit comments

Comments
 (0)