clean up github actions workflow file

oro-os · Nov 22, 2023 · 3690e6c · 3690e6c
1 parent 6f19bb8
commit 3690e6c
Showing 1 changed file with 13 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,36 +1,28 @@
-name: Build & Test (x86_64)
+name: Build & Test - x64
 on:
   push:
     # FIXME(qix-): DRY this up when\b\bif actions/runner#1182 is ever fixed.
     paths:
       - '.github/workflows/build.yml'
-      - 'oro-boot/**'
-      - 'oro-boot-limine/**'
-      - 'oro-kernel/**'
-      - 'oro-ser2mem/**'
-      - 'oro-ser2mem-proc/**'
-      - 'triple/x86_64.json'
+      - 'oro-*/**'
+      - 'triple/**'
       - 'Cargo.toml'
       - 'Cargo.lock'
       - 'Makefile'
       - 'rust-toolchain.toml'
   pull_request:
     paths:
       - '.github/workflows/build.yml'
-      - 'oro-boot/**'
-      - 'oro-boot-limine/**'
-      - 'oro-kernel/**'
-      - 'oro-ser2mem/**'
-      - 'oro-ser2mem-proc/**'
-      - 'triple/x86_64.json'
+      - 'oro-*/**'
+      - 'triple/**'
       - 'Cargo.toml'
       - 'Cargo.lock'
       - 'Makefile'
       - 'rust-toolchain.toml'
 
 jobs:
-  build-x86_64:
-    name: Build x86_64
+  build:
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -48,11 +40,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: target/
-          key: ${{ runner.os }}-kernel-build-target
+          key: x64-kernel-build-target
       - name: Build <D>
         run: make DEBUG=1 all
       - name: Build <R>
-        run: make all x86_64-limine.pxe
+        run: make all x64-limine.pxe
       - name: Lint
         run: make lint
       - name: Clippy
@@ -62,10 +54,10 @@ jobs:
         with:
           name: kernel-pxe
           path: target/x86_64/release/pxe
-  test-link-x86_64:
-    name: Test (x86_64 / Link)
-    runs-on: [self-hosted, oro, oro-link, x86_64]
-    needs: build-x86_64
+  test-link:
+    name: Test - Link
+    runs-on: [self-hosted, oro, oro-link, x64]
+    needs: build
     steps:
       - name: Download build
         uses: actions/download-artifact@v3