Commit de5215bd authored by Dave Cooper's avatar Dave Cooper
Browse files

Merge branch 'hotfix/ci-fix'

parents 2a3305fc 2bc5e261
Pipeline #5206 failed with stages
in 14 seconds
......@@ -12,15 +12,25 @@ stages:
update:
stage: update
only:
- master
- devo
script:
- bash -x ./.ci-script.sh linux git-pull
# - bash -x ./.ci-script.sh windows rsync-from-manager
# - bash -x ./.ci-script.sh macos rsync-from-manager
windows-update:
only:
- master
stage: update
script:
- bash -x ./.ci-script.sh windows git-pull
linux-build:
stage: build
# only:
# - master
only:
- master
- devo
script:
- bash -x ./.ci-script.sh linux build-gendl
......@@ -42,9 +52,11 @@ windows-build:
# - bash -x ./.ci-script.sh macos build-gendl
containerize:
stage: containerize
only:
- master
- devo
script:
- bash -x ./docker/build
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment