Skip to content

Commit

Permalink
Add workflow for mingw-w64-gcc package testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackhex committed Oct 10, 2024
1 parent a112439 commit f9cac1a
Show file tree
Hide file tree
Showing 9 changed files with 459 additions and 23 deletions.
35 changes: 19 additions & 16 deletions .github/scripts/build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,33 @@ 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 "") \
$([ "$CLEAN_BUILD" = 1 ] && echo "--cleanbuild" || echo "") \
$([ "$INSTALL_PACKAGE" = 1 ] && echo "--install" || echo "")"
--rmdeps \
--noconfirm \
--noprogressbar \
--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 "")"

echo "::group::Ccache statistics before build"
ccache -svv || true
ccache -svv || true
echo "::endgroup::"

echo "::group::Build package"
if [[ "$PACKAGE_REPOSITORY" == *MINGW* ]]; then
makepkg-mingw $ARGUMENTS
else
makepkg $ARGUMENTS
fi
if [[ "$PACKAGE_REPOSITORY" == *MINGW* ]]; then
makepkg-mingw $ARGUMENTS
else
makepkg $ARGUMENTS
fi
echo "::endgroup::"

echo "::group::Ccache statistics after build"
ccache -svv || true
ccache -svv || true
echo "::endgroup::"
30 changes: 30 additions & 0 deletions .github/scripts/check-package.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash

set -e # exit on error
set -x # echo on
set -o pipefail # fail of any command in pipeline is an error

PACKAGE_REPOSITORY=$1

INSTALL_PACKAGE=${INSTALL_PACKAGE:-0}
NO_EXTRACT=${NO_EXTRACT:-1}
NO_ARCHIVE=${NO_ARCHIVE:-1}

ARGUMENTS="--syncdeps \
--rmdeps \
--noconfirm \
--noprogressbar \
--skippgpcheck \
--recheck \
--force \
$([ "$NO_EXTRACT" = 1 ] && echo "--noextract" || echo "") \
$([ "$NO_ARCHIVE" = 1 ] && echo "--noarchive" || echo "") \
$([ "$INSTALL_PACKAGE" = 1 ] && echo "--install" || echo "")"

echo "::group::Check package"
if [[ "$PACKAGE_REPOSITORY" == *MINGW* ]]; then
makepkg-mingw $ARGUMENTS
else
makepkg $ARGUMENTS
fi
echo "::endgroup::"
18 changes: 18 additions & 0 deletions .github/scripts/patch-dejagnu.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/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`

echo "::group::Install patch"
pacman -S --noconfirm patch
echo "::endgroup::"

pushd /
echo "::group::Patch Dejagnu"
patch -p1 -b -i "$DIR/patches/dejagnu/0001-local-exec.patch"
echo "::endgroup::"
popd
21 changes: 21 additions & 0 deletions .github/scripts/patch-makepkg.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

set -e # exit on error
set -x # echo on
set -o pipefail # fail of any command in pipeline is an error

if [ -z "$GITHUB_WORKSPACE" ]; then
DIR=`pwd`
else
DIR=`cygpath "$GITHUB_WORKSPACE"`
fi

echo "::group::Install patch"
pacman -S --noconfirm patch
echo "::endgroup::"

pushd /
echo "::group::Patch MSYS2 environment"
patch -p1 -b -i "$DIR/patches/makepkg/0004-add-recheck-option.patch"
echo "::endgroup::"
popd
78 changes: 78 additions & 0 deletions .github/workflows/build-and-test-mingw-w64-gcc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
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 that should be built and tested'
required: false
default: 'aarch64'
tag:
description: 'Tag to use for the artifact'
required: true
gcc_module:
description: 'GCC module to test'
required: false
default: 'gcc-c'
gcc_test_filter:
description: 'GCC test filter'
required: false
default: 'compile.exp=103818.c'
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

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' }}
runner_arch: ${{ inputs.arch || 'aarch64' }}
cross_build: false
check: true
check_module: ${{ inputs.gcc_module || 'gcc-c' }}
check_filter: ${{ inputs.gcc_test_filter || 'compile.exp=103818.c' }}

create-summary:
needs: build-and-test-mingw-w64-gcc
name: Create summary
runs-on: ubuntu-latest

steps:
- name: Checkout mingw-woarm64-build repository
uses: actions/checkout@v4
with:
repository: Windows-on-ARM-Experiments/mingw-woarm64-build

- name: Download test results artifacts
uses: actions/download-artifact@v4
with:
name: mingw-w64-gcc-test-results
path: ${{ github.workspace }}/test-results

- name: Create summary
run: |
.github/scripts/toolchain/create-gcc-summary.sh ${{ github.workspace }}/test-results >> $GITHUB_STEP_SUMMARY
67 changes: 60 additions & 7 deletions .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,53 @@ on:
description: "Architecture to build on"
type: string
default: "x86_64"
cross_build:
description: "Use MSYS2 -> MINGW cross-compiler"
type: boolean
default: false
needs:
description: "Parent workflow job dependencies"
type: string
dependencies:
description: "Install additional dependencies"
type: string
default: ""
check:
description: "Enable check step after the package is built"
type: boolean
default: false
check_module:
description: "Module to test"
type: string
default: ""
check_filter:
description: "Test filter"
type: string
default: ""

defaults:
run:
shell: msys2 {0}

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROSS_BUILD: ${{ inputs.runner_arch == 'aarch64' && '1' || '0' }}
CLEAN_BUILD: 1
CROSS_BUILD: ${{ inputs.cross_build && '1' || '0' }}
MODULE: ${{ inputs.check_module }}
FILTER: ${{ inputs.check_filter }}

jobs:
build:
name: Build ${{ inputs.package_name }}
runs-on: >-
${{ fromJson(inputs.runner_arch == 'aarch64'
&& '["Windows", "ARM64", "Blackhex"]'
|| '["windows-latest"]') }}
|| (inputs.check && '["Windows", "X64", "GCC"]' || '["windows-latest"]')
) }}
timeout-minutes: ${{ inputs.check && 720 || 180 }}

steps:
- name: Kill hanging processes
if: ${{ inputs.runner_arch == 'aarch64' }}
if: ${{ inputs.runner_arch == 'aarch64' || inputs.check }}
shell: powershell
run: |
tasklist
Expand All @@ -62,7 +81,7 @@ jobs:
git config --global core.longpaths true
- name: Fix $PATH
if: ${{ inputs.runner_arch == 'aarch64' }}
if: ${{ inputs.runner_arch == 'aarch64' || inputs.check }}
shell: powershell
run: |
Write-Output "GITHUB_PATH: $env:GITHUB_PATH"
Expand Down Expand Up @@ -120,8 +139,11 @@ jobs:
mingw-w64-x86_64-jq \
base-devel \
${{ contains(inputs.packages_repository, 'MINGW')
&& 'mingw-w64-cross-mingwarm64-gcc mingw-w64-cross-mingwarm64-windows-default-manifest mingw-w64-x86_64-gcc-libs'
|| '' }} \
&& (inputs.cross_build
&& 'mingw-w64-cross-mingwarm64-gcc mingw-w64-cross-mingwarm64-windows-default-manifest mingw-w64-x86_64-gcc-libs'
|| 'mingw-w64-aarch64-gcc')
|| '' }} \
${{ inputs.check && 'dejagnu' || ''}} \
${{ inputs.dependencies }}
- name: Download artifacts
Expand All @@ -139,6 +161,16 @@ jobs:
run: |
`cygpath "${{ github.workspace }}"`/.github/scripts/pthread-headers-hack-before.sh
- name: Patch Dejagnu
if: ${{ inputs.check }}
run: |
`cygpath "${{ github.workspace }}"`/.github/scripts/patch-dejagnu.sh
- name: Patch makepkg
if: ${{ inputs.check }}
run: |
`cygpath "${{ github.workspace }}"`/.github/scripts/patch-makepkg.sh
- name: Setup MINGWARM64 environment
if: ${{ inputs.runner_arch == 'aarch64' }}
run: |
Expand All @@ -158,9 +190,21 @@ jobs:

- name: Build ${{ inputs.package_name }}
working-directory: ${{ github.workspace }}/packages/${{ inputs.package_name }}
env:
CLEAN_BUILD: 1
NO_ARCHIVE: ${{ inputs.check && '1' || '0' }}
run: |
`cygpath "${{ github.workspace }}"`/.github/scripts/build-package.sh ${{ inputs.packages_repository }}
- name: Check ${{ inputs.package_name }}
if: ${{ inputs.check }}
working-directory: ${{ github.workspace }}/packages/${{ inputs.package_name }}
env:
NO_EXTRACT: 1
NO_ARCHIVE: 1
run: |
`cygpath "${{ github.workspace }}"`/.github/scripts/check-package.sh ${{ inputs.packages_repository }}
- name: Save Ccache
if: always()
uses: actions/cache/save@v4
Expand All @@ -169,12 +213,21 @@ jobs:
key: ${{ inputs.package_name }}-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: 7
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 }}-test-results
retention-days: 14
path: ${{ github.workspace }}/packages/${{ inputs.package_name }}/src/test-results

- name: Upload build folder
if: failure()
uses: actions/upload-artifact@v4
Expand Down
Loading

0 comments on commit f9cac1a

Please sign in to comment.