Fix up Circle to actually work for Alpine

apollographql · Aug 12, 2024 · 8db2a10 · 8db2a10
1 parent 89df533
commit 8db2a10
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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 musl-dev, bash
+                command: apk add musl-dev curl
 
       - install_rust_toolchain:
           rust_channel: << parameters.rust_channel >>
@@ -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 >> ]
@@ -392,6 +392,7 @@ commands:
 
       - run:
           name: Install default versions of npm and node
+          shell: /bin/bash
           command: |
             volta install node@16
             volta install npm@8
@@ -407,10 +408,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