Fix self-hosted apt lock issue

birth-software · Dec 1, 2024 · eeec62b · eeec62b
1 parent d234b50
commit eeec62b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       BIRTH_GITHUB_TARGETS: ${{ steps.generate-config.outputs.BIRTH_GITHUB_TARGETS }}
+      BIRTH_ORACLE_LINUX_IMAGE: ${{ steps.generate-config.outputs.BIRTH_ORACLE_LINUX_IMAGE }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -25,6 +26,8 @@ jobs:
       matrix:
         os: ${{ fromJSON(needs.generate-config.outputs.BIRTH_GITHUB_TARGETS) }}
     runs-on: ${{ matrix.os }}
+    env:
+      BIRTH_ORACLE_LINUX_IMAGE: ${{ needs.generate-config.outputs.BIRTH_ORACLE_LINUX_IMAGE }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -33,7 +36,7 @@ jobs:
       - name: Check
         shell: bash
         run: |
-          set -ex
+          set -eux
           echo $BIRTH_NATIVE_OS_STRING
           echo $BIRTH_NATIVE_ARCH_STRING
           echo $BIRTH_ARCH

diff --git a/action.yml b/action.yml
@@ -32,12 +32,15 @@ runs:
         echo "BIRTH_OS=$BIRTH_OS" >> $GITHUB_ENV
         echo "BIRTH_ARCH=$BIRTH_ARCH" >> $GITHUB_ENV
 
+        MATRIX_OS=${{ inputs.os }}
         case $BIRTH_OS in
           linux)
             uname -a
             lsb_release -a
             df -h
-            sudo apt-get install -y ninja-build clang mold
+            if [[ "$BIRTH_ARCH" != "aarch64" ]]; then
+              sudo apt-get install -y ninja-build clang mold
+            fi
             ;;
           macos)
             uname -a