Skip to content
Snippets Groups Projects
Commit 67bc0ebc authored by michael.minelli's avatar michael.minelli
Browse files

CI/CD => Bug fix: On sign stage export only the current binaries folder

parent 97ba028b
Branches
Tags
No related merge requests found
Pipeline #30127 passed
...@@ -30,7 +30,7 @@ variables: ...@@ -30,7 +30,7 @@ variables:
BIN_FOLDER_WINDOWS_ARM64: $BIN_FOLDER_WINDOWS/arm64 BIN_FOLDER_WINDOWS_ARM64: $BIN_FOLDER_WINDOWS/arm64
BIN_FOLDER_WINDOWS_X64: $BIN_FOLDER_WINDOWS/x64 BIN_FOLDER_WINDOWS_X64: $BIN_FOLDER_WINDOWS/x64
VERSION_FILE: $ARTIFACTS_FOLDER/VERSION CONFIG_FILE: $ARTIFACTS_FOLDER/CONFIG.env
VERSION_DEV_SUFFIX: '-dev' VERSION_DEV_SUFFIX: '-dev'
VERSION_TEST_SUFFIX: '-test' VERSION_TEST_SUFFIX: '-test'
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
- rm -Rf ${PKG_BUILD_FOLDER_NAME} - rm -Rf ${PKG_BUILD_FOLDER_NAME}
artifacts: artifacts:
paths: paths:
- $ARTIFACTS_FOLDER/* - $BIN_FOLDER_DEBIAN_PKG_AND_SIGN/*
expire_in: 10 mins expire_in: 10 mins
rules: rules:
- if: $CI_COMMIT_REF_PROTECTED == "true" - if: $CI_COMMIT_REF_PROTECTED == "true"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
dependencies: dependencies:
- build:version - build:version
script: script:
- VERSION=$(cat $VERSION_FILE) - source $CONFIG_FILE
- !reference [ .get_version_dependent_vars, script ] - !reference [ .get_version_dependent_vars, script ]
- security unlock-keychain -p $SIGN_KEYCHAIN_PASSWORD $SIGN_LOGIN_KEYCHAIN_PATH - security unlock-keychain -p $SIGN_KEYCHAIN_PASSWORD $SIGN_LOGIN_KEYCHAIN_PATH
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
- rm -Rf ${BIN_NAME_BASE}_pkg - rm -Rf ${BIN_NAME_BASE}_pkg
artifacts: artifacts:
paths: paths:
- $ARTIFACTS_FOLDER/* - $BIN_FOLDER_MACOS_PKG_AND_SIGN/*
expire_in: 10 mins expire_in: 10 mins
rules: rules:
- if: $CI_COMMIT_REF_PROTECTED == "true" - if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
...@@ -10,7 +10,7 @@ build:version: ...@@ -10,7 +10,7 @@ build:version:
- !reference [ .get_version_dependent_vars, script ] - !reference [ .get_version_dependent_vars, script ]
- mkdir -p $ARTIFACTS_FOLDER - mkdir -p $ARTIFACTS_FOLDER
- echo $VERSION > $VERSION_FILE - echo "VERSION=${VERSION}" > $CONFIG_FILE
# Build # Build
- !reference [ .build_cli, script ] - !reference [ .build_cli, script ]
......
pkg_and_sign:debian: pkg_and_sign:debian:
parallel: parallel:
matrix: matrix:
- ARCH: [ "arm64", "amd64" ] - ARCH: "arm64"
BIN_FOLDER_DEBIAN_PKG_AND_SIGN: $BIN_FOLDER_LINUX_ARM64
- ARCH: "amd64"
BIN_FOLDER_DEBIAN_PKG_AND_SIGN: $BIN_FOLDER_LINUX_X64
before_script: before_script:
- !reference [ .global_before_script, script ] - !reference [ .global_before_script, script ]
- BIN_FOLDER_DEBIAN_PKG_AND_SIGN=$([[ $ARCH == "arm64" ]] && echo ${BIN_FOLDER_LINUX_ARM64} || echo ${BIN_FOLDER_LINUX_X64})
extends: .pkg_and_sign:debian extends: .pkg_and_sign:debian
pkg_and_sign:debian:test: pkg_and_sign:debian:test:
parallel: parallel:
matrix: matrix:
- ARCH: [ "arm64", "amd64" ] - ARCH: "arm64"
BIN_FOLDER_DEBIAN_PKG_AND_SIGN: $BIN_FOLDER_LINUX_ARM64
- ARCH: "amd64"
BIN_FOLDER_DEBIAN_PKG_AND_SIGN: $BIN_FOLDER_LINUX_X64
before_script: before_script:
- !reference [ .global_before_script, script ] - !reference [ .global_before_script, script ]
- BIN_FOLDER_DEBIAN_PKG_AND_SIGN=$([[ $ARCH == "arm64" ]] && echo ${BIN_FOLDER_LINUX_ARM64} || echo ${BIN_FOLDER_LINUX_X64})
extends: .pkg_and_sign:debian extends: .pkg_and_sign:debian
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
...@@ -25,14 +29,20 @@ pkg_and_sign:debian:test: ...@@ -25,14 +29,20 @@ pkg_and_sign:debian:test:
pkg_and_sign:macos: pkg_and_sign:macos:
parallel: parallel:
matrix: matrix:
- BIN_FOLDER_MACOS_PKG_AND_SIGN: [ "$BIN_FOLDER_MACOS_ARM64", "$BIN_FOLDER_MACOS_X64" ] - ARCH: "arm64"
BIN_FOLDER_MACOS_PKG_AND_SIGN: $BIN_FOLDER_MACOS_ARM64
- ARCH: "amd64"
BIN_FOLDER_MACOS_PKG_AND_SIGN: $BIN_FOLDER_MACOS_X64
extends: .pkg_and_sign:macos extends: .pkg_and_sign:macos
pkg_and_sign:macos:test: pkg_and_sign:macos:test:
parallel: parallel:
matrix: matrix:
- BIN_FOLDER_MACOS_PKG_AND_SIGN: [ "$BIN_FOLDER_MACOS_ARM64", "$BIN_FOLDER_MACOS_X64" ] - ARCH: "arm64"
BIN_FOLDER_MACOS_PKG_AND_SIGN: $BIN_FOLDER_MACOS_ARM64
- ARCH: "amd64"
BIN_FOLDER_MACOS_PKG_AND_SIGN: $BIN_FOLDER_MACOS_X64
extends: .pkg_and_sign:macos extends: .pkg_and_sign:macos
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
......
...@@ -3,6 +3,7 @@ upload:packages: ...@@ -3,6 +3,7 @@ upload:packages:
tags: tags:
- gitlab_package - gitlab_package
dependencies: dependencies:
- build:version
- pkg_and_sign:macos - pkg_and_sign:macos
- pkg_and_sign:debian - pkg_and_sign:debian
image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment