Skip to content
Snippets Groups Projects
Commit 0bb7053a authored by Simon McVittie's avatar Simon McVittie
Browse files

Append -dev to Docker image tags unless we are building a git tag


This avoids overwriting r.g.s.c/p/s/s:0.20210126.1-0 with subsequent
builds that come from the same Proton version.

The :latest tag will still be overwritten every time.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 280a285d
No related branches found
No related tags found
No related merge requests found
...@@ -27,9 +27,22 @@ checkout: ...@@ -27,9 +27,22 @@ checkout:
stage: checkout stage: checkout
before_script: before_script:
script: script:
- |
if [ -n "${CI_COMMIT_TAG-}" ]; then
PROTONSDK_VERSION="${CI_COMMIT_TAG#v}"
else
# will be expanded by make
PROTONSDK_VERSION='$(STEAMRT_VERSION)-dev'
fi
- git clone $PROTON_SOURCE proton - git clone $PROTON_SOURCE proton
- git -C proton checkout $PROTON_COMMIT - git -C proton checkout $PROTON_COMMIT
- make -C proton/docker DOCKER=true SOURCES_URLBASE=SOURCES_URLBASE | grep 'true build' > commands - >
make
-C proton/docker
DOCKER=true
PROTONSDK_VERSION="$PROTONSDK_VERSION"
SOURCES_URLBASE=SOURCES_URLBASE
| grep 'true build' > commands
- grep 'f build-base-i686' commands > build-base-i686.sh - grep 'f build-base-i686' commands > build-base-i686.sh
- grep 'f build-base-x86_64' commands > build-base-x86_64.sh - grep 'f build-base-x86_64' commands > build-base-x86_64.sh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment