Skip to content

Commit 283ec7a

Browse files
Revert "fix(ci): turborepo library release workflow (#7642)"
This reverts commit a88e522.
1 parent cd5d240 commit 283ec7a

File tree

2 files changed

+36
-16
lines changed

2 files changed

+36
-16
lines changed

.github/actions/setup-rust/action.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ inputs:
1313
required: false
1414
github-token:
1515
description: "GitHub token. You can pass secrets.GITHUB_TOKEN"
16-
required: false
17-
default: ${{ github.token }}
16+
required: true
1817
shared-cache-key:
1918
description: "A cache key that is used instead of the automatic `job`-based key, and is stable over multiple jobs."
2019
required: false

.github/workflows/turborepo-library-release.yml

+35-14
Original file line numberDiff line numberDiff line change
@@ -26,41 +26,60 @@ jobs:
2626
target: "aarch64-unknown-linux-gnu"
2727
setup: |
2828
sudo apt update
29-
sudo apt install -y crossbuild-essential-arm64
30-
29+
sudo apt install -y g++-aarch64-linux-gnu libc6-dev-arm64-cross
3130
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
3231
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
3332
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV
3433
3534
- host: ubuntu-latest
3635
target: "x86_64-unknown-linux-gnu"
36+
container: amazon/aws-lambda-nodejs:18
37+
install: |
38+
yum install -y gcc gcc-c++ git
39+
curl https://sh.rustup.rs -sSf | bash -s -- -y
40+
41+
setup: |
42+
pnpm install
3743
3844
- host: ubuntu-latest
3945
target: "x86_64-unknown-linux-musl"
46+
container: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
47+
install: |
48+
apk add libc6-compat curl
4049
setup: |
41-
sudo apt update
42-
sudo apt install -y musl-tools
50+
pnpm install
4351
4452
- host: ubuntu-latest
4553
target: "aarch64-unknown-linux-musl"
54+
container: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
55+
install: |
56+
apk add libc6-compat curl
57+
echo /root/.cargo/bin >> ${GITHUB_PATH}
58+
echo /usr/local/cargo/bin/rustup >> ${GITHUB_PATH}
59+
echo /aarch64-linux-musl-cross/bin >> ${GITHUB_PATH}
60+
export PATH=/aarch64-linux-musl-cross/bin:/usr/local/cargo/bin/rustup:/root/.cargo/bin:${PATH}
4661
setup: |
47-
sudo apt update
48-
sudo apt install -y crossbuild-essential-arm64 musl-tools clang llvm
49-
50-
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
51-
echo "CC_aarch64_unknown_linux_musl=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
52-
echo "CXX_aarch64_unknown_linux_musl=aarch64-linux-gnu-g++" >> $GITHUB_ENV
53-
rust_env: 'RUSTFLAGS="-Ctarget-feature=-crt-static"'
62+
export PATH=/aarch64-linux-musl-cross/bin:/usr/local/cargo/bin/rustup:/root/.cargo/bin:${PATH}
63+
rustup default $(cat ./rust-toolchain)-aarch64-unknown-linux-musl
64+
rustup target add aarch64-unknown-linux-musl
65+
rustup toolchain install $(cat ./rust-toolchain)
66+
pnpm install
67+
rust_env: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc RUSTFLAGS="-Ctarget-feature=-crt-static"
5468

5569
- host: windows-latest
5670
target: "aarch64-pc-windows-msvc"
5771

5872
- host: windows-latest
5973
target: "x86_64-pc-windows-msvc"
6074

61-
name: "Build ${{ matrix.settings.target }}"
6275
runs-on: ${{ matrix.settings.host }}
76+
container:
77+
image: ${{ matrix.settings.container }}
6378
steps:
79+
- name: Install Packages
80+
run: ${{ matrix.settings.install }}
81+
if: ${{ matrix.settings.install }}
82+
6483
- name: Checkout
6584
uses: actions/checkout@v3
6685
with:
@@ -70,17 +89,19 @@ jobs:
7089
uses: ./.github/actions/setup-rust
7190
with:
7291
targets: ${{ matrix.settings.target }}
92+
if: ${{ !matrix.settings.install }}
7393

7494
- name: Setup Node
7595
uses: ./.github/actions/setup-node
96+
with:
97+
enable-corepack: false
98+
if: ${{ !matrix.settings.install }}
7699

77100
- name: Setup toolchain
78-
shell: bash
79101
run: ${{ matrix.settings.setup }}
80102
if: ${{ matrix.settings.setup }}
81103

82104
- name: Build native library
83-
shell: bash
84105
run: |
85106
cd packages/turbo-repository
86107
${{ matrix.settings.rust_env }} pnpm build:release --target=${{ matrix.settings.target }}

0 commit comments

Comments
 (0)