Skip to content

Commit

Permalink
Fixed MacOS Matching
Browse files Browse the repository at this point in the history
  • Loading branch information
Redfire75369 committed Oct 16, 2024
1 parent 4781e01 commit 470264d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ runs:
- name: Get LLVM Version from Rust
shell: bash
run: |
rustc --version --verbose | sed -n 's/LLVM version: \([0-9]\+\).*/LLVM_MAJOR_VERSION=\1/p' >> $GITHUB_ENV
rustc --version --verbose | sed -n 's/LLVM version: \([0-9]\+\.[0-9]\+\.[0-9]\+\)/LLVM_VERSION=\1/p' >> $GITHUB_ENV
rustc --version --verbose | sed -n 's/LLVM version: \([0-9]\{1,\}\).*/LLVM_MAJOR_VERSION=\1/p' >> $GITHUB_ENV
rustc --version --verbose | sed -n 's/LLVM version: \([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\)/LLVM_VERSION=\1/p' >> $GITHUB_ENV
- name: Install Dependencies on Windows
if: inputs.os == 'windows'
Expand All @@ -27,7 +27,7 @@ runs:
MOZTOOLS_PATH: ${{ github.workspace }}\\target\\dependencies\\moztools-4.0
shell: pwsh
run: |
curl -SL "$env:MOZTOOLS_LINK/moztools-$env:MOZTOOLS_VERSION.zip" --create-dirs -o target/dependencies/moztools.zip
curl -fsSL "$env:MOZTOOLS_LINK/moztools-$env:MOZTOOLS_VERSION.zip" --create-dirs -o target/dependencies/moztools.zip
cd target/dependencies && unzip -qo moztools.zip -d .
Write-Output "MOZTOOLS_PATH=$env:MOZTOOLS_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Expand All @@ -49,10 +49,9 @@ runs:
if: inputs.os == 'macos'
shell: bash
run: |
HOMEBREW_NO_AUTO_UPDATE="" brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
echo "llvm@$LLVM_VERSION" "lld@$LLVM_VERSION"
HOMEBREW_NO_AUTO_UPDATE="" brew install llvm@$LLVM_VERSION lld@$LLVM_VERSION yasm
{ echo "$(brew --prefix llvm@$LLVM_VERSION)/bin"; cat "$GITHUB_PATH"; } > "$GITHUB_PATH.new"
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
brew install llvm@$LLVM_MAJOR_VERSION yasm
{ echo "$(brew --prefix llvm@$LLVM_MAJOR_VERSION)/bin"; cat "$GITHUB_PATH"; } > "$GITHUB_PATH.new"
mv "$GITHUB_PATH.new" "$GITHUB_PATH"
echo "CC=clang" >> $GITHUB_ENV
Expand Down
Empty file modified .github/scripts/macos-linker.sh
100644 → 100755
Empty file.

0 comments on commit 470264d

Please sign in to comment.