Split GPRbuild and GNATcov builds in different runs

Also add GPRbuild run for macOS aarch64
alire-project · Aug 1, 2024 · f65f5e6 · f65f5e6
1 parent e82af19
commit f65f5e6
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 11 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -52,8 +52,8 @@ jobs:
 
 
 
-  gprbuild_gnatcov:
-    name: GPRbuild and GNATcov
+  gprbuild:
+    name: GPRbuild
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Project
@@ -77,6 +77,30 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
 
+    - uses: actions/upload-artifact@v2
+      with:
+        name: release-packages
+        path: sbx/*/release_package*/install/*
+        retention-days: 5
+
+
+  gnatcov:
+    name: GNATcov
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout Project
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install e3-core==22.1.0
+
     - name: Build GNATcov
       run: ./anod build gnatcov -v --loglevel DEBUG --enable-cleanup
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -48,8 +48,8 @@ jobs:
         retention-days: 5
 
 
-  gprbuild_gnatcov:
-    name: GPRbuild and GNATcov
+  gprbuild:
+    name: GPRbuild
     runs-on: macos-12
     steps:
     - name: Checkout Project
@@ -73,6 +73,29 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
 
+    - uses: actions/upload-artifact@v2
+      with:
+        name: release-packages
+        path: sbx/*/release_package*/install/*
+        retention-days: 5
+
+
+  gnatcov:
+    name: GNATcov
+    runs-on: macos-12
+    steps:
+    - name: Checkout Project
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install e3-core==22.1.0
 
     - name: Build GNATcov
       run: ./anod build gnatcov -v --loglevel DEBUG --enable-cleanup
@@ -89,7 +112,6 @@ jobs:
         retention-days: 5
 
 
-
   gnat_cross:
     strategy:
       matrix:

diff --git a/.github/workflows/macos_arm.yml b/.github/workflows/macos_arm.yml
@@ -165,6 +165,40 @@ jobs:
           path: /tmp/alt-ergo-install
 
 
+  gprbuild:
+    name: GPRbuild
+    runs-on: macos-14
+    steps:
+    - name: Set Xcode 15.3
+      run: sudo xcode-select --switch /Applications/Xcode_15.3.app
+
+    - name: Checkout Project
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.10.11
+
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install e3-core==22.1.0
+
+    - name: Build GPRbuild
+      run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup
+
+    - name: Package GPRbuild
+      run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: release-packages
+        path: sbx/*/release_package*/install/*
+        retention-days: 5
+
 
   spark:
     name: SPARK

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -63,8 +63,8 @@ jobs:
 
 
 
-  gprbuild_gnatcov:
-    name: GPRbuild and GNATcov
+  gprbuild:
+    name: GPRbuild
     runs-on: windows-2019
     env:
       CONFIG_SHELL: /bin/bash
@@ -104,6 +104,45 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
 
+    - uses: actions/upload-artifact@v2
+      with:
+        name: release-packages
+        path: C:/aaa/GNAT-FSF-builds/sbx/*/release_package*/install/*
+        retention-days: 5
+
+
+
+  gnatcov:
+    name: GPRbuild and GNATcov
+    runs-on: windows-2019
+    env:
+      CONFIG_SHELL: /bin/bash
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - name: Checkout Project
+      uses: actions/checkout@v2
+
+    - name: Install msys2
+      uses: msys2/setup-msys2@v2
+      with:
+        install: >-
+          base-devel
+          git
+          mingw-w64-x86_64-toolchain
+          mingw-w64-x86_64-github-cli
+          mingw-w64-x86_64-python
+          mingw-w64-x86_64-python-pip
+          mingw-w64-x86_64-python-psutil
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install e3-core==22.1.0
+
+    - name: Prepare msys2 build setup
+      # 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
 
     - name: Build GNATcov
       run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build gnatcov -v --loglevel DEBUG --enable-cleanup
@@ -120,10 +159,6 @@ jobs:
         retention-days: 5
 
 
-
-
-
-
   gnat_cross:
     strategy:
       matrix: