s390x had no dedicated builder and ran as a cross-compile pinned to amd64 via nodeSelector, colliding with the x86_64-linux step on the same node — Woodpecker's k8s backend couldn't create the per-step secret twice and the workflow failed with either "secrets already exists" or "Canceled". Disable until a real s390x builder is wired up. Step names now match the kubernetes.io/arch label they target; the ci/build.py argument keeps the Nix system tuple (x86_64-linux, aarch64-linux).
This commit is contained in:
+22
-21
@@ -17,7 +17,7 @@ clone:
|
|||||||
|
|
||||||
# Build packages for each architecture in parallel
|
# Build packages for each architecture in parallel
|
||||||
steps:
|
steps:
|
||||||
- name: build-x86_64-linux
|
- name: build-amd64
|
||||||
image: git.oleks.space/oleks/nix-ci:latest
|
image: git.oleks.space/oleks/nix-ci:latest
|
||||||
depends_on: []
|
depends_on: []
|
||||||
environment:
|
environment:
|
||||||
@@ -37,7 +37,7 @@ steps:
|
|||||||
- sh ci/setup.sh
|
- sh ci/setup.sh
|
||||||
- python3 ci/build.py x86_64-linux
|
- python3 ci/build.py x86_64-linux
|
||||||
|
|
||||||
- name: build-aarch64-linux
|
- name: build-arm64
|
||||||
image: git.oleks.space/oleks/nix-ci:latest
|
image: git.oleks.space/oleks/nix-ci:latest
|
||||||
depends_on: []
|
depends_on: []
|
||||||
environment:
|
environment:
|
||||||
@@ -57,22 +57,23 @@ steps:
|
|||||||
- sh ci/setup.sh
|
- sh ci/setup.sh
|
||||||
- python3 ci/build.py aarch64-linux
|
- python3 ci/build.py aarch64-linux
|
||||||
|
|
||||||
- name: build-s390x-linux
|
# s390x disabled: no builder available
|
||||||
image: git.oleks.space/oleks/nix-ci:latest
|
# - name: build-s390x
|
||||||
depends_on: []
|
# image: git.oleks.space/oleks/nix-ci:latest
|
||||||
environment:
|
# depends_on: []
|
||||||
ATTIC_TOKEN:
|
# environment:
|
||||||
from_secret: attic_token
|
# ATTIC_TOKEN:
|
||||||
GITEA_CLONE_TOKEN:
|
# from_secret: attic_token
|
||||||
from_secret: gitea_clone_token
|
# GITEA_CLONE_TOKEN:
|
||||||
backend_options:
|
# from_secret: gitea_clone_token
|
||||||
kubernetes:
|
# backend_options:
|
||||||
nodeSelector:
|
# kubernetes:
|
||||||
kubernetes.io/arch: amd64
|
# nodeSelector:
|
||||||
labels:
|
# kubernetes.io/arch: amd64
|
||||||
commit-tag: "${CI_COMMIT_TAG}"
|
# labels:
|
||||||
commit-branch: "${CI_COMMIT_BRANCH}"
|
# commit-tag: "${CI_COMMIT_TAG}"
|
||||||
pipeline-number: "${CI_PIPELINE_NUMBER}"
|
# commit-branch: "${CI_COMMIT_BRANCH}"
|
||||||
commands:
|
# pipeline-number: "${CI_PIPELINE_NUMBER}"
|
||||||
- sh ci/setup.sh
|
# commands:
|
||||||
- python3 ci/build.py s390x-linux
|
# - sh ci/setup.sh
|
||||||
|
# - python3 ci/build.py s390x-linux
|
||||||
|
|||||||
Reference in New Issue
Block a user