Build gnatprove with "base_gcc" to avoid waiting for the GNAT build

alire-project · Oct 20, 2023 · 396ef25 · 396ef25
1 parent f41435a
commit 396ef25
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -213,17 +213,12 @@ jobs:
 
   spark:
     name: spark
-    needs: [gnat_gprbuild, why3, alt_ergo]
+    needs: [why3, alt_ergo]
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
 
-    - uses: actions/download-artifact@v2
-      with:
-        name: anod-artifacts
-        path: in_artifacts/
-
     - uses: actions/download-artifact@v2
       with:
         name: alt-ergo

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -211,17 +211,12 @@ jobs:
 
   spark:
     name: SPARK
-    needs: [gnat_gprbuild, why3, alt_ergo]
+    needs: [why3, alt_ergo]
     runs-on: macos-12
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
 
-    - uses: actions/download-artifact@v2
-      with:
-        name: anod-artifacts
-        path: in_artifacts/
-
     - uses: actions/download-artifact@v2
       with:
         name: alt-ergo

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -258,7 +258,7 @@ jobs:
 
   spark:
     name: spark
-    needs: [gnat_gprbuild, why3, alt_ergo]
+    needs: [why3, alt_ergo]
     runs-on: windows-2019
     env:
       CONFIG_SHELL: /bin/bash
@@ -289,11 +289,6 @@ jobs:
       # We need a path that is compatible between Windows and Unix world
       run: df -h; mkdir /c/aaa; mount C:/aaa /aaa ; cd ..; cp -r GNAT-FSF-builds /c/aaa
 
-    - uses: actions/download-artifact@v2
-      with:
-        name: anod-artifacts
-        path: C:/aaa/GNAT-FSF-builds/in_artifacts/
-
     - uses: actions/download-artifact@v2
       with:
         name: alt-ergo

diff --git a/specs/base_gcc.anod b/specs/base_gcc.anod
@@ -8,7 +8,7 @@ from e3.anod.spec import Anod
 class base_gcc(spec("common")):
     @property
     def version(self):
-        return "12.2.0-1"
+        return "13.2.0-1"
 
     @property
     def tarball(self):

diff --git a/specs/spark2014.anod b/specs/spark2014.anod
@@ -87,7 +87,7 @@ class SPARK2014(spec("common")):
     @property
     def build_deps(self):
         deps = [
-            Anod.Dependency("gcc"),
+            Anod.Dependency("base_gcc"),
             Anod.Dependency("why3"),
             Anod.Dependency("alt-ergo"),
             Anod.Dependency("gmp", qualifier="shared_lib"),
@@ -108,6 +108,7 @@ class SPARK2014(spec("common")):
             self,
             makefile=os.path.join(self["SRC_DIR"], "Makefile"),
             exec_dir=self["SRC_DIR"],
+            jobs=self.jobs
         )
         for dep in self.deps:
             self.deps[dep].setenv()
@@ -126,7 +127,7 @@ class SPARK2014(spec("common")):
         _bin = os.path.join(self["INSTALL_DIR"], "bin")
         sync_tree(os.path.join(self["SRC_DIR"], "install"), self["INSTALL_DIR"])
 
-        sync_tree(self.deps["gcc"]["INSTALL_DIR"], libexec_spark, delete=False)
+        sync_tree(self.deps["base_gcc"]["INSTALL_DIR"], libexec_spark, delete=False)
         # Remove all gnat* executables except gnatbind/gnatls, only keep
         # gcc/gnatbind/gpr* executables.
         for glob in ["gnat*", "gdb*", "gcov*", "ld*", "nm", "g++", "ar",