Try running Linux builds on WarpBuild

omnigres · Jun 13, 2024 · d7fa524 · d7fa524
1 parent 7da1df3
commit d7fa524
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -4,18 +4,23 @@ on:
   #  - cron:  '0 0 * * *'
   #push:
   pull_request:
+  workflow_dispatch:
 
 
 jobs:
   gnat_gprbuild:
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
+    runs-on: ${{ matrix.runner }}
     name: GNAT Linux and GPRbuild
-    runs-on: ubuntu-20.04
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: deadsnakes/[email protected]
       with:
         python-version: 3.8
 
@@ -25,7 +30,7 @@ jobs:
         pip install e3-core==22.1.0
 
     - name: Install Ada dependencies
-      run: sudo apt-get install gnat bison
+      run: sudo apt-get install -y gnat bison
 
     - name: Build GNAT native
       run: ./anod build gcc -v --loglevel DEBUG --enable-cleanup
@@ -63,7 +68,10 @@ jobs:
   gnatcov:
     name: GNATcov
     needs: gnat_gprbuild
-    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
+    runs-on: ${{ matrix.runner }}
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
@@ -74,7 +82,7 @@ jobs:
         path: in_artifacts/
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: deadsnakes/[email protected]
       with:
         python-version: 3.8
 
@@ -100,12 +108,13 @@ jobs:
 
 
   gnat_cross:
+    needs: gnat_gprbuild
     strategy:
       matrix:
         target: ["arm-elf", "riscv64-elf", "avr-elf"]
+        runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
     name: GNAT ${{ matrix.target }}-linux
-    needs: gnat_gprbuild
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.runner }}
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
@@ -116,7 +125,7 @@ jobs:
         path: in_artifacts/
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: deadsnakes/[email protected]
       with:
         python-version: 3.8
 
@@ -148,8 +157,8 @@ jobs:
       matrix:
         ocaml-compiler:
           - 4.11.2
-
-    runs-on: ubuntu-20.04
+        runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -178,16 +187,18 @@ jobs:
       - name: Upload the build artifact
         uses: actions/upload-artifact@v2
         with:
-          name: why3
+          name: why3-${{ matrix.runner }}
           path: /tmp/why3install
 
 
   alt_ergo:
     strategy:
       matrix:
         ocaml-compiler:
-          - "4.11.2"
-    runs-on: ubuntu-20.04
+          - 4.11.2
+        runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
+    runs-on: ${{ matrix.runner }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -207,30 +218,33 @@ jobs:
       - name: Upload the build artifact
         uses: actions/upload-artifact@v2
         with:
-          name: alt-ergo
+          name: alt-ergo-${{ matrix.runner }}
           path: /tmp/alt-ergo-install
 
 
   spark:
     name: spark
     needs: [why3, alt_ergo]
-    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
+    runs-on: ${{ matrix.runner }}
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
 
     - uses: actions/download-artifact@v2
       with:
-        name: alt-ergo
+        name: alt-ergo-${{ matrix.runner }}
         path: alt-ergo_artifact/
 
     - uses: actions/download-artifact@v2
       with:
-        name: why3
+        name: why3-${{ matrix.runner }}
         path: why3_artifact/
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: deadsnakes/[email protected]
       with:
         python-version: 3.8
 

diff --git a/lib/platform_db.py b/lib/platform_db.py
@@ -51,3 +51,5 @@ def update_db(self) -> None:
 
             }
         )
+
+        self.host_guess.update({"aarch64-linux": {"os": "Linux", "cpu": "aarch64"}})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,3 +51,5 @@ def update_db(self) -> None:

		}
		)

		self.host_guess.update({"aarch64-linux": {"os": "Linux", "cpu": "aarch64"}})