Skip to content

Commit

Permalink
Fix GHA build for PRs (not tagged commits) for missing withAsserts LL…
Browse files Browse the repository at this point in the history
…VM prebuilt package OSX arm64
  • Loading branch information
JohanEngelen committed Jan 25, 2025
1 parent b89ba89 commit 1b681ee
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .github/actions/1-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ runs:
if [[ '${{ github.ref }}' = refs/tags/* ]]; then
assertsSuffix=""
fi
# -withAsserts package does not exist for LLVM 14 and OSX arm64
if [[ '$version-$os-$arch' = 14.0.3-osx-arm64 ]]; then
assertsSuffix=""
fi
if [[ '${{ runner.os }}' == Windows ]]; then
curl -fL --retry 3 --max-time 300 -o llvm.7z \
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/merge-macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ runs:
steps:

- name: Download x86_64 artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: osx-x86_64
path: artifacts/
- name: Download arm64 artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: osx-arm64
path: artifacts/
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/merge-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ runs:
steps:

- name: Download x64 artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: windows-x64
path: artifacts/
- name: Download x86 artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: windows-x86
path: artifacts/
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/upload-to-github/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ runs:
steps:

- name: Download all artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts/

Expand Down

0 comments on commit 1b681ee

Please sign in to comment.