Update gh actions with new plat support

qir-alliance · May 10, 2024 · e625528 · e625528
1 parent 1b53f5d
commit e625528
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/.github/actions/install-llvm/action.yml b/.github/actions/install-llvm/action.yml
@@ -8,6 +8,9 @@ inputs:
   os:
     description: "The OS being built upon."
     required: true
+  arch:
+    description: "The OS arch target being built."
+    required: true
   directory:
     description: "The directory to install LLVM binaries to."
     required: true

diff --git a/.github/actions/rust-toolchain/action.yml b/.github/actions/rust-toolchain/action.yml
@@ -1,8 +1,12 @@
 name: rust-toolchain
+description: "Install a Rust toolchain."
+
 inputs:
   toolchain:
+    description: "The toolchain name. Usually a version number."
     required: false
   components:
+    description: "Additional components to install."
     required: false
 
 runs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,23 +75,13 @@ jobs:
         with:
           python-version: 3.8
         if: ${{ matrix.config.os != 'macos-14' }}
-      - name: Linux - Install build dependencies, ccache, ninja
-        run: sudo apt-get install -y ccache ninja-build
-        if: ${{ matrix.config.os == 'ubuntu-20.04' }}
-      - name: Windows - Install build dependencies, sccache, ninja
-        run: choco install --accept-license -y sccache ninja
-        if: ${{ matrix.config.os == 'windows-2019' }}
-      - name: MacOS - Install build dependencies, ccache, ninja
-        run: brew install ccache ninja
-        if: ${{ matrix.config.os == 'macos-11' }}
-      - name: MacOS - Install build dependencies, ccache, ninja
-        run: brew install ccache ninja
-        if: ${{ matrix.config.os == 'macos-14' }}
+
       - name: Install LLVM
         uses: ./.github/actions/install-llvm
         with:
           version: "14"
           os: ${{ matrix.config.os }}
+          arch: ${{ matrix.config.arch }}
           directory: ${{ github.workspace }}/target/llvm
           target: ${{ matrix.config.target }}
       - name: "Build ${{ matrix.config.target }}"

diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
@@ -38,6 +38,13 @@ jobs:
               arch: "aarch64",
               env: {},
             }
+          - {
+              os: "macos-14",
+              arch: "universal",
+              env: {
+                ARCHFLAGS: "-arch arm64 -arch x86_64"
+              }
+            }
     steps:
       - uses: actions/checkout@v4
         with:
@@ -63,7 +70,7 @@ jobs:
       - name: Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-${{ matrix.config.os }}-${{ matrix.config.arch }}
           if-no-files-found: error
           path: |
             target/**/*.zip