mirror of
https://github.com/factoriotools/factorio-docker.git
synced 2024-11-07 03:07:24 +01:00
Mark 0.17 stable
This commit is contained in:
parent
b38750e4ac
commit
1b7decd8ce
@ -16,8 +16,7 @@ jobs:
|
|||||||
- bash -c 'shopt -s globstar; shellcheck **/*.sh'
|
- bash -c 'shopt -s globstar; shellcheck **/*.sh'
|
||||||
- &build
|
- &build
|
||||||
stage: build
|
stage: build
|
||||||
# set EXTRA_TAG to latest,stable when no more experimental versions for 0.17 come out
|
env: VERSION_SHORT=0.17 EXTRA_TAG=latest,stable
|
||||||
env: VERSION_SHORT=0.17 EXTRA_TAG=latest
|
|
||||||
script:
|
script:
|
||||||
- ./build.sh $VERSION_SHORT
|
- ./build.sh $VERSION_SHORT
|
||||||
- <<: *build
|
- <<: *build
|
||||||
|
4
build.sh
4
build.sh
@ -38,7 +38,7 @@ else
|
|||||||
if [[ -n ${EXTRA_TAG:-} ]]; then
|
if [[ -n ${EXTRA_TAG:-} ]]; then
|
||||||
IFS=","
|
IFS=","
|
||||||
for TAG in $EXTRA_TAG; do
|
for TAG in $EXTRA_TAG; do
|
||||||
TAGS+=" -t $DOCKER_REPO:$EXTRA_TAG"
|
TAGS+=" -t $DOCKER_REPO:$TAG"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -55,7 +55,7 @@ fi
|
|||||||
# latest changes where made in the folder corosponding to the version we build, we are on master and don#t build a PR.
|
# latest changes where made in the folder corosponding to the version we build, we are on master and don#t build a PR.
|
||||||
if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRAVIS_BRANCH == master ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
|
if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRAVIS_BRANCH == master ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
|
||||||
# we build a tag and we are not on master
|
# we build a tag and we are not on master
|
||||||
[[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
|
[[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ ${TRAVIS_PULL_REQUEST_BRANCH:-} == "" ]] ||
|
||||||
# we are not in CI
|
# we are not in CI
|
||||||
[[ -z ${CI:-} ]]; then
|
[[ -z ${CI:-} ]]; then
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user