-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(ci): brew link x86 toolchain for macos13 runner
It seems we need to manually symlink the x86_64-unknown-linux-gnu toolchain for the macos13 runner. Also, we don't need to overwrite the python version anymore Fixes #285
- Loading branch information
1 parent
bb373e5
commit bfe1366
Showing
1 changed file
with
4 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -293,7 +293,7 @@ jobs: | |
- name: Set CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER | ||
run: echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=${{ matrix.target }}-gcc" >> $GITHUB_ENV | ||
- name: Build for ${{ matrix.target }} | ||
run: cargo build --target ${{ matrix.target }} --all-targets | ||
run: cargo build -target ${{ matrix.target }} --all-targets | ||
|
||
cross-build-fips: | ||
name: Cross build from macOS to Linux (FIPS) | ||
|
@@ -313,17 +313,16 @@ jobs: | |
uses: actions/setup-go@v5 | ||
with: | ||
go-version: '>=1.22.0' | ||
- name: Install ${{ matrix.target }} toolchain | ||
run: brew tap messense/macos-cross-toolchains && brew install ${{ matrix.target }} && brew link x86_64-unknown-linux-gnu | ||
- name: Install Clang-12 | ||
uses: KyleMayes/install-llvm-action@v1 | ||
with: | ||
version: "12.0.0" | ||
directory: ${{ runner.temp }}/llvm | ||
- name: Add clang++-12 link | ||
working-directory: ${{ runner.temp }}/llvm/bin | ||
run: ln -s clang clang++-12 | ||
- name: Install ${{ matrix.target }} toolchain | ||
# TODO(rmehra): find a better way to overwrite the python3 version without specifying version | ||
run: brew tap messense/macos-cross-toolchains && brew install --overwrite [email protected] && brew install ${{ matrix.target }} | ||
run: ln -s clang++ clang++-12 | ||
- name: Set BORING_BSSL_FIPS_COMPILER_EXTERNAL_TOOLCHAIN | ||
run: echo "BORING_BSSL_FIPS_COMPILER_EXTERNAL_TOOLCHAIN=$(brew --prefix ${{ matrix.target }})/toolchain" >> $GITHUB_ENV | ||
shell: bash | ||
|