fix(release): build x86 ubuntu in xenial for GLIBC (#3043)

Follow up to #3039
vercel · Dec 16, 2022 · 8ca67c3 · 8ca67c3
1 parent f9138e3
commit 8ca67c3
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/build_rust.yml b/.github/workflows/build_rust.yml
@@ -23,11 +23,15 @@ jobs:
             target: "aarch64-apple-darwin"
             lib-cache-key: turbo-lib-darwin-${{ inputs.release_branch }}
           - host: ubuntu-latest
+            container: ubuntu:xenial
+            container-options: "--platform=linux/amd64 --rm"
+            container-setup: "apt-get update && apt-get install -y curl"
             target: "x86_64-unknown-linux-gnu"
             lib-cache-key: turbo-lib-cross-${{ inputs.release_branch }}
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
+            setup: "apt-get install -y build-essential clang-5.0 lldb-5.0 llvm-5.0-dev libclang-5.0-dev"
           - host: ubuntu-latest
             container: ubuntu:xenial
+            container-options: "--rm"
             container-setup: "apt-get update && apt-get install -y curl"
             target: "aarch64-unknown-linux-gnu"
             lib-cache-key: turbo-lib-cross-${{ inputs.release_branch }}
@@ -38,7 +42,9 @@ jobs:
             lib-cache-key: turbo-lib-cross-${{ inputs.release_branch }}
             setup: "mv cli/libturbo/turbo-windows_windows_amd64_v1/lib/turbo.exe cli/libturbo/turbo-windows_windows_amd64_v1/lib/libturbo.a && mv cli/libturbo/turbo-windows_windows_amd64_v1/lib/turbo.h cli/libturbo/turbo-windows_windows_amd64_v1/lib/libturbo.h && rustup set default-host x86_64-pc-windows-gnu"
     runs-on: ${{ matrix.settings.host }}
-    container: ${{ matrix.settings.container }}
+    container:
+      image: ${{ matrix.settings.container }}
+      options: ${{ matrix.settings.container-options }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -50,7 +56,6 @@ jobs:
 
       - name: Install
         uses: actions-rs/toolchain@v1
-        if: ${{ !matrix.settings.docker }}
         with:
           profile: minimal
           override: true
@@ -109,11 +114,6 @@ jobs:
         run: ${{ matrix.settings.setup }}
 
       - name: Build
-        if: ${{ !matrix.settings.docker }}
-        run: ${{ matrix.settings.rustflags }} cargo build --release -p turbo --target ${{ matrix.settings.target }}
-
-      - name: Build in Docker
-        if: ${{ matrix.settings.docker }}
         run: ${{ matrix.settings.rustflags }} cargo build --release -p turbo --target ${{ matrix.settings.target }}
 
       - name: Upload Artifacts