Compare commits

2 Commits

2 changed files with 33 additions and 37 deletions

View File

@ -4,14 +4,14 @@ stages:
- prepare
- release
.image-buster:
image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-buster'
#.image-buster:
# image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-buster'
.image-bullseye:
image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-bullseye'
.image-focal:
image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-focal'
#.image-focal:
# image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-focal'
.code-coverage:
stage: build
@ -80,17 +80,17 @@ build:bullseye:
- .code-coverage
needs: [ ]
build:focal:
extends:
- .image-focal
- .build
needs: [ ]
#build:focal:
# extends:
# - .image-focal
# - .build
# needs: [ ]
build:buster:
extends:
- .build
- .image-buster
needs: [ ]
#build:buster:
# extends:
# - .build
# - .image-buster
# needs: [ ]
debian-package:bullseye:
extends:
@ -100,33 +100,31 @@ debian-package:bullseye:
- build:bullseye
needs: [ "build:bullseye" ]
debian-package:focal:
extends:
- .image-focal
- .debian-package
dependencies:
- build:focal
needs: [ "build:focal" ]
#debian-package:focal:
# extends:
# - .image-focal
# - .debian-package
# dependencies:
# - build:focal
# needs: [ "build:focal" ]
debian-package:buster:
extends:
- .image-buster
- .debian-package
dependencies:
- build:buster
needs: [ "build:buster" ]
#debian-package:buster:
# extends:
# - .image-buster
# - .debian-package
# dependencies:
# - build:buster
# needs: [ "build:buster" ]
prepare_job:
stage: prepare # This stage must run before the release stage
stage: prepare
rules:
- if: $CI_COMMIT_TAG
when: never # Do not run this job when a tag is created manually
# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch
script:
- echo "TAG=v$(cat VERSION)" >> variables.env # and append to the variables.env file
- echo "TAG=v$(cat VERSION)" >> variables.env
artifacts:
reports:
dotenv: variables.env # Use artifacts:reports:dotenv to expose the variables to other jobs
dotenv: variables.env
release_job:
stage: release
@ -136,12 +134,10 @@ release_job:
artifacts: true
rules:
- if: $CI_COMMIT_TAG
when: never
# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
script:
- echo "running release_job for $TAG"
release:
name: 'Release $CI_COMMIT_TAG'
description: 'Created using the release-cli'
tag_name: '$CI_COMMIT_TAG'
ref: '$CI_COMMIT_TAG'
ref: '$CI_COMMIT_SHA'

View File

@ -63,7 +63,7 @@ for i in "${images[@]}"; do
--from "${basectr}" \
--format docker \
--iidfile "${IIDFILE}" \
--tag "${IMAGETAG}"
--tag "${IMAGETAG}" \
--build-arg BUILDTIMESTAMP="`date --iso-8601=seconds`"
if [ "${REGISTRY}" != "none" ]; then