Skip to content

Commit

Permalink
Actually build on Alpine in CI
Browse files Browse the repository at this point in the history
This ensures we're not doing anything with glibc
  • Loading branch information
jonathanrainer committed Aug 12, 2024
1 parent ec7c457 commit 9ef6220
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ executors:

amd_musl: &amd_musl_executor
docker:
- image: cimg/base:stable
- image: rust:alpine
resource_class: xlarge
environment:
XTASK_TARGET: "x86_64-unknown-linux-musl"
Expand Down Expand Up @@ -322,8 +322,8 @@ commands:
equal: [*amd_musl_executor, << parameters.platform >>]
steps:
- run:
name: Install musl-tools and bash
command: sudo apt-get install -y musl-tools bash musl-dev
name: Install Alpine required Dependencies
command: apk add musl-dev curl bash nodejs npm cmake g++ make python3

- install_rust_toolchain:
rust_channel: << parameters.rust_channel >>
Expand All @@ -341,14 +341,14 @@ commands:
or:
- equal: [ *amd_windows_executor, << parameters.platform >> ]
- equal: [ *arm_ubuntu_executor, << parameters.platform >> ]
- equal: [ *amd_musl_executor, << parameters.platform >> ]
steps:
- run:
name: Install volta
command: |
curl https://get.volta.sh | bash -s -- --skip-setup
echo 'export VOLTA_HOME=$HOME/.volta' >> $BASH_ENV
echo 'export PATH=$VOLTA_HOME/bin:$PATH' >> $BASH_ENV
- when:
condition:
equal: [ *arm_ubuntu_executor, << parameters.platform >> ]
Expand Down Expand Up @@ -390,11 +390,15 @@ commands:
choco install cmake.install -y --installargs 'ADD_CMAKE_TO_PATH=User'
exit $LASTEXITCODE
- run:
name: Install default versions of npm and node
command: |
volta install node@16
volta install npm@8
- unless:
condition:
equal: [ *amd_musl_executor, << parameters.platform >> ]
steps:
- run:
name: Install default versions of npm and node
command: |
volta install node@16
volta install npm@8
install_rust_toolchain:
Expand All @@ -407,10 +411,16 @@ commands:
steps:
- unless:
condition:
equal: [ *amd_windows_executor, << parameters.platform >> ]
or:
- equal: [ *amd_windows_executor, << parameters.platform >> ]
- equal: [ *amd_musl_executor, << parameters.platform >> ]
steps:
- rust/install:
version: << parameters.rust_channel >>
- unless:
condition:
equal: [ *amd_windows_executor, << parameters.platform >> ]
steps:
- run:
name: Adds rust target
command: rustup target add $XTASK_TARGET
Expand Down

0 comments on commit 9ef6220

Please sign in to comment.