Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] Prepare for MQ vol.2 #8

Closed
wants to merge 4 commits into from
Closed

[ci] Prepare for MQ vol.2 #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1efb0a3
[ci] Prepare for MQ vol.2
alvicsam Nov 16, 2023
36b188b
Merge branch 'master' into as-enable-prcr
Bullrich Nov 17, 2023
03a933b
Merge branch 'paritytech:master' into as-enable-prcr
mordamax Nov 17, 2023
6570aad
Merge branch 'master' into as-enable-prcr
alvicsam Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into as-enable-prcr
  • Loading branch information
@alvicsam
alvicsam authored Nov 24, 2023
commit 6570aad723a61b7ee3e2e2a31984b88e8c3f5fc3
3 changes: 2 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ variables:
NEXTEST_FAILURE_OUTPUT: immediate-final
NEXTEST_SUCCESS_OUTPUT: final
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.80"
DOCKER_IMAGES_VERSION: "${CI_COMMIT_SHA}"
DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"


default:
retry:
Expand Down
5 changes: 3 additions & 2 deletions .gitlab/pipeline/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ publish-rustdoc:
DOCKERFILE: "" # docker/path-to.Dockerfile
IMAGE_NAME: "" # docker.io/paritypr/image_name
script:
# Exit if the job is not running in a merge queue
# - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
# Dockertag should differ in a merge queue
# TODO: test this
- if [[ $CI_COMMIT_REF_NAME == *"gh-readonly-queue"* ]]; export DOCKER_IMAGES_VERSION="${CI_COMMIT_SHORT_SHA}"; fi
- $BUILDAH_COMMAND build
--format=docker
--build-arg VCS_REF="${CI_COMMIT_SHA}"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.