Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 029796a

Browse files
committed
Merge branch 'master' into ao-past-session-slashing-client
* master: malus: dont panic on missing validation data (#6952) Offences Migration v1: Removes `ReportsByKindIndex` (#7114) Fix stalling dispute coordinator. (#7125) Fix rolling session window (#7126) [ci] Update buildah command and version (#7128) Bump assigned_slots params (#6991) XCM: Remote account converter (#6662) Rework `dispute-coordinator` to use `RuntimeInfo` for obtaining session information instead of `RollingSessionWindow` (#6968) Revert default proof size back to 64 KB (#7115)
2 parents 6a4f7b3 + 64170f4 commit 029796a

17 files changed

Lines changed: 1080 additions & 493 deletions

File tree

.gitlab-ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ variables:
3434
GIT_DEPTH: 100
3535
CI_SERVER_NAME: "GitLab CI"
3636
CI_IMAGE: "paritytech/ci-linux:production"
37-
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
37+
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
38+
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
3839
DOCKER_OS: "debian:stretch"
3940
ARCH: "x86_64"
4041
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43"
@@ -169,7 +170,7 @@ default:
169170
- test "$DOCKER_USER" -a "$DOCKER_PASS" ||
170171
( echo "no docker credentials provided"; exit 1 )
171172
- cd ./artifacts
172-
- buildah bud
173+
- $BUILDAH_COMMAND build
173174
--format=docker
174175
--build-arg VCS_REF="${CI_COMMIT_SHA}"
175176
--build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
@@ -180,9 +181,9 @@ default:
180181
# The job will success only on the protected branch
181182
- echo "$DOCKER_PASS" |
182183
buildah login --username "$DOCKER_USER" --password-stdin docker.io
183-
- buildah info
184-
- buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
185-
- buildah push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
184+
- $BUILDAH_COMMAND info
185+
- $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$VERSION"
186+
- $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
186187
after_script:
187188
- buildah logout --all
188189

0 commit comments

Comments
 (0)