diff --git a/.github/workflows/obs.yml b/.github/workflows/obs.yml index 61a58ed..793b36a 100644 --- a/.github/workflows/obs.yml +++ b/.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 diff --git a/dependencies.yaml b/dependencies.yaml index 4a0658f..b017966 100644 --- a/dependencies.yaml +++ b/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 diff --git a/scripts/bundle/build b/scripts/bundle/build index 61d326d..e0633e8 100755 --- a/scripts/bundle/build +++ b/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 diff --git a/scripts/obs b/scripts/obs index 1fa436f..d8688e1 100755 --- a/scripts/obs +++ b/scripts/obs @@ -30,7 +30,6 @@ obs_stage() { --packages "$PACKAGE" \ --project "$PROJECT" \ --version "$VERSION" \ - --architectures amd64,arm64,ppc64le \ --submit=false \ --nomock } diff --git a/templates/latest/cri-o/bundle/versions b/templates/latest/cri-o/bundle/versions index a82b1b7..ba0c05e 100755 --- a/templates/latest/cri-o/bundle/versions +++ b/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