Add support for s390x

.github/workflows/obs.yml

@@ -69,6 +69,7 @@ jobs:
           - amd64
           - arm64
           - ppc64le
+          - s390x
     name: bundle / build / ${{ inputs.revision || 'main' }} / ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v4
@@ -103,6 +104,10 @@ jobs:
         with:
           name: bundles-amd64
           path: build/bundle
+      - name: Install criu dependency
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y criu
       - run: sudo -E scripts/bundle/test
         if: ${{ inputs.skip-bundles == false }}
         env:
@@ -143,6 +148,11 @@ jobs:
         with:
           name: bundles-ppc64le
           path: build/bundle
+      - uses: actions/download-artifact@v4
+        if: ${{ inputs.skip-bundles == false && github.event_name != 'pull_request' }}
+        with:
+          name: bundles-s390x
+          path: build/bundle
       - run: scripts/sign-artifacts
         if: ${{ inputs.skip-bundles == false && github.event_name != 'pull_request' }}
       - uses: google-github-actions/upload-cloud-storage@v2
@@ -239,6 +249,7 @@ jobs:
           - amd64
           - arm64
           - ppc64le
+          # - s390x # TODO: enable when first packages are built
         exclude:
           - run:
               image: fedora:38

dependencies.yaml

@@ -117,7 +117,7 @@ dependencies:
         match: conmon
 
   - name: conmon-rs (latest)
-    version: v0.6.1
+    version: v0.6.2
     refPaths:
       - path: templates/latest/cri-o/bundle/versions
         match: conmon-rs
@@ -135,7 +135,7 @@ dependencies:
         match: runc
 
   - name: crun (latest)
-    version: 1.14.1
+    version: 1.14.4
     refPaths:
       - path: templates/latest/cri-o/bundle/versions
         match: crun

scripts/bundle/build

@@ -11,6 +11,7 @@ source "$TEMPLATES_DIR/versions"
 ARCH_AMD64=amd64
 ARCH_ARM64=arm64
 ARCH_PPC64LE=ppc64le
+ARCH_S390X=s390x
 ARCH=${ARCH:-$ARCH_AMD64}
 
 ARCHIVE_ID=$COMMIT
@@ -126,6 +127,8 @@ if [[ $ARCH == "$ARCH_ARM64" ]]; then
     ELF_ARCH=aarch64
 elif [[ $ARCH == "$ARCH_PPC64LE" ]]; then
     ELF_ARCH=PowerPC
+elif [[ $ARCH == "$ARCH_S390X" ]]; then
+    ELF_ARCH=S/390
 else
     ELF_ARCH=x86-64
 fi

scripts/obs

@@ -30,7 +30,6 @@ obs_stage() {
         --packages "$PACKAGE" \
         --project "$PROJECT" \
         --version "$VERSION" \
-        --architectures amd64,arm64,ppc64le \
         --submit=false \
         --nomock
 }

templates/latest/cri-o/bundle/versions

@@ -5,9 +5,9 @@ set -euox pipefail
 declare -A VERSIONS=(
     ["cni-plugins"]=v1.4.0
     ["conmon"]=v2.1.10
-    ["conmon-rs"]=v0.6.1
+    ["conmon-rs"]=v0.6.2
     ["cri-tools"]=v1.29.0
-    ["crun"]=1.14.1
+    ["crun"]=1.14.4
     ["runc"]=v1.1.12
 )
 export VERSIONS