Update runner-ppc64le.patch to add dotnet 8 support

.github/workflows/build.yml

@@ -4,9 +4,9 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
-    branches: [ "main", "testflow" ]
+    branches: [ "main", "testflow", "patch-dotnet8" ]
   pull_request:
-    branches: [ "main", "testflow" ]
+    branches: [ "main", "testflow", "patch-dotnet8" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -16,13 +16,13 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-22.04-s390x
+    runs-on: self-hosted
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Runs a single command using the runners shell
       - name: Run a one-line script
-        run: ./setup-build-env.sh
+        run: ./setup-build-env.sh -s 8

Dockerfile.ubuntu

@@ -6,10 +6,14 @@ ENV     DEBIAN_FRONTEND=noninteractive
 
 RUN     apt-get -qq update -y && \
         apt-get -qq -y install wget git sudo alien curl libicu70 sudo && \
+        apt-get -qq -y install cpio rpm2cpio && \
         apt autoclean
 
 COPY    build-files/convert-rpm.sh /tmp
 
+RUN     sed "s/--no-absolute-filenames//" /usr/share/perl5/Alien/Package/Rpm.pm > /tmp/Rpm.pm
+RUN     cp /tmp/Rpm.pm /usr/share/perl5/Alien/Package/Rpm.pm
+
 RUN     /tmp/convert-rpm.sh ${SDK}
 
 RUN     dpkg --install /tmp/*.deb && \

build-files/build-image.sh

@@ -4,11 +4,15 @@ update_fresh_container() {
     echo "Upgrading and installing packages"
     sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update -y
     sudo DEBIAN_FRONTEND=noninteractive apt-get -qq install alien libicu70 -y
+
     if [ $? -ne 0 ]; then
         exit 32
     fi
     sudo apt autoclean
 
+    sudo sed "s/--no-absolute-filenames//" /usr/share/perl5/Alien/Package/Rpm.pm > /tmp/Rpm.pm
+    sudo cp /tmp/Rpm.pm /usr/share/perl5/Alien/Package/Rpm.pm
+
     echo "Initializing LXD environment"
     sudo lxd init --preseed </tmp/lxd-preseed.yaml
 
@@ -17,21 +21,22 @@ update_fresh_container() {
 }
 
 setup_dotnet_sdk() {
-    MIRROR="https://mirror.lchs.network/pub/almalinux/9.3/AppStream/${ARCH}/os/Packages"
+    MIRROR="https://mirror.lchs.network/pub/almalinux/9/AppStream/${ARCH}/os/Packages"
     case "${SDK}" in 
-        7)
-            PKGS="dotnet-apphost-pack-7.0-7.0.15-1.el9_3 dotnet-host-8.0.1-1.el9_3"
-            PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.15-1.el9_3 dotnet-targeting-pack-7.0-7.0.15-1.el9_3"
-            PKGS="${PKGS} dotnet-templates-7.0-7.0.115-1.el9_3 dotnet-runtime-7.0-7.0.15-1.el9_3"
-            PKGS="${PKGS} dotnet-sdk-7.0-7.0.115-1.el9_3 aspnetcore-runtime-7.0-7.0.15-1.el9_3"
-            PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.15-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
+        8)
+            PKGS="dotnet-apphost-pack-8.0-8.0.5-1.el9_4 dotnet-host-8.0.5-1.el9_4"
+            PKGS="${PKGS} dotnet-hostfxr-8.0-8.0.5-1.el9_4 dotnet-targeting-pack-8.0-8.0.5-1.el9_4"
+            PKGS="${PKGS} dotnet-templates-8.0-8.0.105-1.el9_4 dotnet-runtime-8.0-8.0.5-1.el9_4"
+            PKGS="${PKGS} dotnet-sdk-8.0-8.0.105-1.el9_4 aspnetcore-runtime-8.0-8.0.5-1.el9_4"
+            PKGS="${PKGS} aspnetcore-targeting-pack-8.0-8.0.5-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
+            PKGS="${PKGS} dotnet-runtime-dbg-8.0-8.0.5-1.el9_4 dotnet-sdk-dbg-8.0-8.0.105-1.el9_4 aspnetcore-runtime-dbg-8.0-8.0.5-1.el9_4"
             ;;
-        6)
-            PKGS="dotnet-host-8.0.1-1.el9_3 dotnet-apphost-pack-6.0-6.0.26-1.el9_3"
-            PKGS="${PKGS} dotnet-hostfxr-6.0-6.0.26-1.el9_3 dotnet-targeting-pack-6.0-6.0.26-1.el9_3"
-            PKGS="${PKGS} dotnet-templates-6.0-6.0.126-1.el9_3 dotnet-runtime-6.0-6.0.26-1.el9_3"
-            PKGS="${PKGS} dotnet-sdk-6.0-6.0.126-1.el9_3 aspnetcore-runtime-6.0-6.0.26-1.el9_3"
-            PKGS="${PKGS} aspnetcore-targeting-pack-6.0-6.0.26-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
+        7)
+            PKGS="dotnet-apphost-pack-7.0-7.0.19-1.el9_4 dotnet-host-8.0.5-1.el9_4"
+            PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.19-1.el9_4 dotnet-targeting-pack-7.0-7.0.19-1.el9_4"
+            PKGS="${PKGS} dotnet-templates-7.0-7.0.119-1.el9_4 dotnet-runtime-7.0-7.0.19-1.el9_4"
+            PKGS="${PKGS} dotnet-sdk-7.0-7.0.119-1.el9_4 aspnetcore-runtime-7.0-7.0.19-1.el9_4"
+            PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.19-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
             ;;
         *)
             echo "Unsupported architecture ${ARCH}" >&2
@@ -85,12 +90,13 @@ patch_runner() {
     cd /tmp
     git clone -q ${RUNNERREPO}
     cd runner
-    git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b ${ARCH}
+    git checkout ${RUNNERVERSION} -b ${ARCH}
     git apply /home/ubuntu/runner-${ARCH}.patch
     return $?
 }
 
 build_runner() {
+    export DOTNET_NUGET_SIGNATURE_VERIFICATION=false
     echo "Building runner binary"
     cd src
 
@@ -153,6 +159,7 @@ export HOME=/home/ubuntu
 ARCH=`uname -m`
 SDK=""
 RUNNERREPO="https://github.com/actions/runner"
+RUNNERVERSION="v2.317.0"
 while getopts "a:s:" opt
 do
     case ${opt} in
@@ -182,3 +189,5 @@ fi
 
 run "$@"
 exit $?
+
+

build-files/convert-rpm.sh

@@ -2,21 +2,22 @@
 . /etc/os-release
 SDK=$1
 ARCH=`uname -m`
-MIRROR="https://mirror.lchs.network/pub/almalinux/9.3/AppStream/${ARCH}/os/Packages"
+MIRROR="https://mirror.lchs.network/pub/almalinux/9/AppStream/${ARCH}/os/Packages"
 case "${SDK}" in
-    7)
-        PKGS="dotnet-apphost-pack-7.0-7.0.15-1.el9_3 dotnet-host-8.0.1-1.el9_3"
-        PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.15-1.el9_3 dotnet-targeting-pack-7.0-7.0.15-1.el9_3"
-        PKGS="${PKGS} dotnet-templates-7.0-7.0.115-1.el9_3 dotnet-runtime-7.0-7.0.15-1.el9_3"
-        PKGS="${PKGS} dotnet-sdk-7.0-7.0.115-1.el9_3 aspnetcore-runtime-7.0-7.0.15-1.el9_3"
-        PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.15-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
+    8)
+        PKGS="dotnet-apphost-pack-8.0-8.0.5-1.el9_4 dotnet-host-8.0.5-1.el9_4"
+        PKGS="${PKGS} dotnet-hostfxr-8.0-8.0.5-1.el9_4 dotnet-targeting-pack-8.0-8.0.5-1.el9_4"
+        PKGS="${PKGS} dotnet-templates-8.0-8.0.105-1.el9_4 dotnet-runtime-8.0-8.0.5-1.el9_4"
+        PKGS="${PKGS} dotnet-sdk-8.0-8.0.105-1.el9_4 aspnetcore-runtime-8.0-8.0.5-1.el9_4"
+        PKGS="${PKGS} aspnetcore-targeting-pack-8.0-8.0.5-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
+        PKGS="${PKGS} dotnet-runtime-dbg-8.0-8.0.5-1.el9_4 dotnet-sdk-dbg-8.0-8.0.105-1.el9_4 aspnetcore-runtime-dbg-8.0-8.0.5-1.el9_4"
         ;;
-    6)
-        PKGS="dotnet-host-8.0.1-1.el9_3 dotnet-apphost-pack-6.0-6.0.26-1.el9_3"
-        PKGS="${PKGS} dotnet-hostfxr-6.0-6.0.26-1.el9_3 dotnet-targeting-pack-6.0-6.0.26-1.el9_3"
-        PKGS="${PKGS} dotnet-templates-6.0-6.0.126-1.el9_3 dotnet-runtime-6.0-6.0.26-1.el9_3"
-        PKGS="${PKGS} dotnet-sdk-6.0-6.0.126-1.el9_3 aspnetcore-runtime-6.0-6.0.26-1.el9_3"
-        PKGS="${PKGS} aspnetcore-targeting-pack-6.0-6.0.26-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
+    7)
+        PKGS="dotnet-apphost-pack-7.0-7.0.19-1.el9_4 dotnet-host-8.0.5-1.el9_4"
+        PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.19-1.el9_4 dotnet-targeting-pack-7.0-7.0.19-1.el9_4"
+        PKGS="${PKGS} dotnet-templates-7.0-7.0.119-1.el9_4 dotnet-runtime-7.0-7.0.19-1.el9_4"
+        PKGS="${PKGS} dotnet-sdk-7.0-7.0.119-1.el9_4 aspnetcore-runtime-7.0-7.0.19-1.el9_4"
+        PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.19-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
         ;;
     *)
         echo "Unsupported SDK ${SDK}" >&2

build-files/run_test.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+patch_runner() {
+    echo "Patching runner"
+    cd /tmp
+    git clone -q ${RUNNERREPO}
+    cd runner
+    git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b ${ARCH}
+    git apply /home/ubuntu/runner-${ARCH}-s8.patch
+    return $?
+}
+
+build_runner() {
+    export DOTNET_NUGET_SIGNATURE_VERIFICATION=false
+    echo "Building runner binary"
+    cd src
+
+    echo "dev layout"
+    ./dev.sh layout
+
+    if [ $? -eq 0 ]; then
+        echo "dev package"
+        ./dev.sh package 
+
+        if [ $? -eq 0 ]; then
+            echo "Finished building runner binary"
+
+            echo "Running tests"
+            ./dev.sh test
+        fi
+    fi
+
+    return $?
+}
+
+install_runner() {
+    echo "Installing runner"
+    sudo mkdir -p /opt/runner 
+    sudo tar -xf /tmp/runner/_package/*.tar.gz -C /opt/runner
+    if [ $? -eq 0 ]; then
+        sudo chown ubuntu:ubuntu -R /opt/runner
+        /opt/runner/config.sh --version
+        #TODO: Verify that the version is the _actual_ latest runner
+    fi
+    return $?
+}
+
+cleanup() {
+    sudo rm -rf /home/ubuntu/build-image.sh /home/ubuntu/runner-${ARCH}-s8.patch \
+           /tmp/runner /tmp/preseed-yaml /opt/runner
+}
+
+run() {
+
+    patch_runner
+    RC=$?
+    if [ ${RC} -eq 0 ]; then
+        build_runner
+        RC=$?
+        if [ ${RC} -eq 0 ]; then
+            install_runner
+            RC=$?
+        fi
+    fi
+    cleanup
+    return ${RC}
+}
+export HOME=/home/ubuntu
+ARCH=`uname -m`
+SDK="-s 8"
+RUNNERREPO="https://github.com/actions/runner"
+run "$@"
+exit $?