Add workflow for mingw-w64-gcc package testing

Blackhex · Blackhex · commit d3ce5ea45ede · 2024-09-02T10:24:08.000+02:00
diff --git a/.github/scripts/build-package.sh b/.github/scripts/build-package.sh
@@ -9,15 +9,18 @@ PACKAGE_REPOSITORY=$1
 CLEAN_BUILD=${CLEAN_BUILD:-0}
 INSTALL_PACKAGE=${INSTALL_PACKAGE:-0}
 NO_EXTRACT=${NO_EXTRACT:-0}
+NO_CHECK=${NO_CHECK:-1}
+NO_ARCHIVE=${NO_ARCHIVE:-0}
 
 ARGUMENTS="--syncdeps \
     --rmdeps \
     --noconfirm \
     --noprogressbar \
-    --nocheck \
     --skippgpcheck \
     --force \
     $([ "$NO_EXTRACT" = 1 ] && echo "--noextract" || echo "") \
+    $([ "$NO_CHECK" = 1 ] && echo "--nocheck " || echo "") \
+    $([ "$NO_ARCHIVE" = 1 ] && echo "--noarchive" || echo "") \
     $([ "$CLEAN_BUILD" = 1 ] && echo "--cleanbuild" || echo "") \
     $([ "$INSTALL_PACKAGE" = 1 ] && echo "--install" || echo "")"
 
diff --git a/.github/scripts/patch-dejagnu.sh b/.github/scripts/patch-dejagnu.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e # exit on error
+set -x # echo on
+set -o pipefail # fail of any command in pipeline is an error
+
+DIR="`dirname ${BASH_SOURCE[0]}`/../.."
+DIR=`realpath $DIR`
+
+pushd /
+  echo "::group::Patch Dejagnu"
+    patch -p1 -b -i "$DIR/patches/dejagnu/0001-local-exec.patch"
+  echo "::endgroup::"
+popd
diff --git a/.github/workflows/build-and-test-mingw-w64-gcc.yml b/.github/workflows/build-and-test-mingw-w64-gcc.yml
@@ -0,0 +1,60 @@
+name: Build and test mingw-w64-gcc
+
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      packages_repository:
+        description: "MSYS2 packages repository to build from"
+        type: string
+        default: "Windows-on-ARM-Experiments/MINGW-packages"
+      packages_branch:
+        description: "MSYS2 packages branch to build from"
+        type: string
+        default: "woarm64"
+      arch:
+        description: 'Architecture to build for'
+        required: false
+        default: 'x86_64'
+      tag:
+        description: 'Tag to use for the artifact'
+        required: true
+      gcc_module:
+        description: 'GCC module to test'
+        required: false
+        default: ''
+      gcc_test_filter:
+        description: 'GCC test filter'
+        required: false
+        default: ''
+  workflow_call:
+    inputs:
+      packages_repository:
+        type: string
+      packages_branch:
+        type: string
+      arch:
+        type: string
+      tag:
+        type: string
+      gcc_module:
+        type: string
+      gcc_test_filter:
+        type: string
+
+defaults:
+  run:
+    shell: msys2 {0}
+
+jobs:
+  build-and-test-mingw-w64-gcc:
+    name: Build and test mingw-w64-gcc
+    uses: ./.github/workflows/build-package.yml
+    with:
+      package_name: mingw-w64-gcc
+      packages_repository: ${{ inputs.packages_repository || 'Windows-on-ARM-Experiments/MINGW-packages' }}
+      packages_branch: ${{ inputs.packages_branch || 'woarm64' }}
+      arch: ${{ inputs.arch || 'x86_64' }}
+      check: true
+      check_module: ${{ inputs.gcc_module || 'gcc-c' }}
+      check_filter: ${{ inputs.gcc_test_filter || 'compile.exp=103818.c' }}
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -6,33 +6,52 @@ on:
       package_name:
         description: "Package name to build"
         type: string
+      packages_repository:
+        description: "MSYS2 packages repository to build from"
+        type: string
+        default: "Windows-on-ARM-Experiments/MSYS2-packages"
+      packages_branch:
+        description: "MSYS2 packages branch to build from"
+        type: string
+        default: "woarm64"
+      arch:
+        description: "Architecture to build for"
+        type: string
+        default: "aarch64"
       needs:
         description: "Parent workflow job dependencies"
         type: string
       dependencies:
         description: "Install additional dependencies"
         type: string
         default: ""
-      packages_repository:
-        description: "MSYS2 packages repository to build from"
+      check:
+        description: "Enable check step after the package is built"
+        type: boolean
+        default: false
+      check_module:
+        description: "Module to test"
         type: string
-        default: "Windows-on-ARM-Experiments/MSYS2-packages"
-      packages_branch:
-        description: "MSYS2 packages branch to build from"
+        default: ""
+      check_filter:
+        description: "Test filter"
         type: string
-        default: "woarm64"
+        default: ""
 
 defaults:
   run:
     shell: msys2 {0}
 
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  NO_CHECK: ${{ inputs.check && '0' || '1' }}
+  NO_ARCHIVE: ${{ inputs.check && '1' || '0' }}
 
 jobs:
   build:
     name: Build ${{ inputs.package_name }}
     runs-on: windows-latest
+    timeout-minutes: 720
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -42,14 +61,24 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Checkout ${{ inputs.packages_repository }} repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.packages_repository }}
+          ref: ${{ inputs.packages_branch }}
+          sparse-checkout: ${{ inputs.package_name }}
+          path: ${{ github.workspace }}/packages
+
       - name: Install dependencies
         run: |
           pacman -S --noconfirm \
             git \
             mingw-w64-x86_64-github-cli \
             mingw-w64-x86_64-jq \
             base-devel \
-            ${{ contains(inputs.packages_repository, 'MINGW') && 'mingw-w64-cross-gcc mingw-w64-x86_64-ccache' || ' ccache' }} \
+            ccache \
+            ${{ contains(inputs.packages_repository, 'MINGW') && format('{0}-{1}-{2}', 'mingw-w64', inputs.arch, 'gcc')|| '' }} \
+            ${{ inputs.check && 'dejagnu' || '' }} \
             ${{ inputs.dependencies }}
 
       - name: Download artifacts
@@ -67,13 +96,10 @@ jobs:
         run: |
           `cygpath "${{ github.workspace }}"`/.github/scripts/pthread-headers-hack-before.sh
 
-      - name: Checkout ${{ inputs.packages_repository }} repository
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ inputs.packages_repository }}
-          ref: ${{ inputs.packages_branch }}
-          sparse-checkout: ${{ inputs.package_name }}
-          path: ${{ github.workspace }}/packages
+      - name: Patch Dejagnu
+        if: ${{ inputs.check }}
+        run: |
+          `cygpath "${{ github.workspace }}"`/.github/scripts/patch-dejagnu.sh
 
       - name: Enable Ccache
         id: enable-ccache
@@ -87,7 +113,7 @@ jobs:
           key: main-ccache-${{ steps.enable-ccache.outputs.timestamp }}
           restore-keys: main-ccache-
 
-      - name: Build ${{ inputs.package_name }}
+      - name: Build ${{ inputs.check && 'and test' || '' }} ${{ inputs.package_name }}
         working-directory: ${{ github.workspace }}/packages/${{ inputs.package_name }}
         run: |
           ccache -svv  || true
@@ -102,12 +128,21 @@ jobs:
           key: main-ccache-${{ steps.enable-ccache.outputs.timestamp }}
 
       - name: Upload ${{ inputs.package_name }}
+        if: ${{ !inputs.check }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.package_name }}
           retention-days: 1
           path: ${{ github.workspace }}/packages/${{ inputs.package_name }}/*.pkg.tar.zst
 
+      - name: Upload ${{ inputs.package_name }} test results
+        if: ${{ inputs.check }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.package_name }}-tests
+          retention-days: 14
+          path: ${{ github.workspace }}/packages/${{ inputs.package_name }}/src/test-results
+
       - name: Upload build folder
         if: failure()
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
   workflow_dispatch:
     inputs:
       msys2_packages_branch:
diff --git a/.github/workflows/mingw-cross-toolchain.yml b/.github/workflows/mingw-cross-toolchain.yml
@@ -24,7 +24,7 @@ jobs:
     with:
       package_name: mingw-w64-cross-headers
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-binutils:
     needs: mingw-w64-cross-headers
@@ -33,7 +33,7 @@ jobs:
       package_name: mingw-w64-cross-binutils
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-gcc-stage1:
     needs: [mingw-w64-cross-headers, mingw-w64-cross-binutils]
@@ -42,7 +42,7 @@ jobs:
       package_name: mingw-w64-cross-gcc-stage1
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-windows-default-manifest:
     needs: [mingw-w64-cross-binutils, mingw-w64-cross-gcc-stage1]
@@ -51,7 +51,7 @@ jobs:
       package_name: mingw-w64-cross-windows-default-manifest
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-crt:
     needs:
@@ -66,7 +66,7 @@ jobs:
       needs: ${{ toJson(needs) }}
       dependencies: mingw-w64-cross-winpthreads
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-winpthreads:
     needs:
@@ -81,7 +81,7 @@ jobs:
       package_name: mingw-w64-cross-winpthreads
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-gcc:
     needs:
@@ -98,7 +98,7 @@ jobs:
       package_name: mingw-w64-cross-gcc
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-zlib:
     needs: [
@@ -115,4 +115,4 @@ jobs:
       package_name: mingw-w64-cross-zlib
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
-      packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
+      packages_branch: ${{ inputs.msys2_packages_branch || 'woarm64' }}
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *.code-workspace
+.idea/
diff --git a/patches/dejagnu/0001-local-exec.patch b/patches/dejagnu/0001-local-exec.patch
