diff --git a/NodeApp/.gitlab-ci/00_vars.yml b/NodeApp/.gitlab-ci/00_vars.yml index 642e2de4b7e2ad37e4cdb90bab91aa7676f34cf3..bab6ab50ebf7df743d8421beb74dc41759f55b29 100644 --- a/NodeApp/.gitlab-ci/00_vars.yml +++ b/NodeApp/.gitlab-ci/00_vars.yml @@ -30,7 +30,7 @@ variables: BIN_FOLDER_WINDOWS_ARM64: $BIN_FOLDER_WINDOWS/arm64 BIN_FOLDER_WINDOWS_X64: $BIN_FOLDER_WINDOWS/x64 - VERSION_FILE: $ARTIFACTS_FOLDER/VERSION + CONFIG_FILE: $ARTIFACTS_FOLDER/CONFIG.env VERSION_DEV_SUFFIX: '-dev' VERSION_TEST_SUFFIX: '-test' diff --git a/NodeApp/.gitlab-ci/02_templates.yml b/NodeApp/.gitlab-ci/02_templates.yml index 828f2739126784378c409ab38d42a9473d7c78b0..6db2a93051bae63eef1536b96840ee9b16416ca1 100644 --- a/NodeApp/.gitlab-ci/02_templates.yml +++ b/NodeApp/.gitlab-ci/02_templates.yml @@ -53,7 +53,7 @@ - rm -Rf ${PKG_BUILD_FOLDER_NAME} artifacts: paths: - - $ARTIFACTS_FOLDER/* + - $BIN_FOLDER_DEBIAN_PKG_AND_SIGN/* expire_in: 10 mins rules: - if: $CI_COMMIT_REF_PROTECTED == "true" @@ -66,7 +66,7 @@ dependencies: - build:version script: - - VERSION=$(cat $VERSION_FILE) + - source $CONFIG_FILE - !reference [ .get_version_dependent_vars, script ] - security unlock-keychain -p $SIGN_KEYCHAIN_PASSWORD $SIGN_LOGIN_KEYCHAIN_PATH @@ -87,7 +87,7 @@ - rm -Rf ${BIN_NAME_BASE}_pkg artifacts: paths: - - $ARTIFACTS_FOLDER/* + - $BIN_FOLDER_MACOS_PKG_AND_SIGN/* expire_in: 10 mins rules: - if: $CI_COMMIT_REF_PROTECTED == "true" \ No newline at end of file diff --git a/NodeApp/.gitlab-ci/06_stageBuild.yml b/NodeApp/.gitlab-ci/06_stageBuild.yml index 322912d428fd17654ce5f4833bc98399f72dfe86..45260652484bee1faf9c912a238659115286e05f 100644 --- a/NodeApp/.gitlab-ci/06_stageBuild.yml +++ b/NodeApp/.gitlab-ci/06_stageBuild.yml @@ -10,7 +10,7 @@ build:version: - !reference [ .get_version_dependent_vars, script ] - mkdir -p $ARTIFACTS_FOLDER - - echo $VERSION > $VERSION_FILE + - echo "VERSION=${VERSION}" > $CONFIG_FILE # Build - !reference [ .build_cli, script ] diff --git a/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml b/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml index be2b3baea3811d354c555a6d2166faff614c4483..ef8c4b8d9507ddcf4b5992f69af6b5b9feb0a5a0 100644 --- a/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml +++ b/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml @@ -1,20 +1,24 @@ pkg_and_sign:debian: parallel: 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: - !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 pkg_and_sign:debian:test: parallel: 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: - !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 artifacts: expire_in: 2 weeks @@ -25,14 +29,20 @@ pkg_and_sign:debian:test: pkg_and_sign:macos: parallel: 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 pkg_and_sign:macos:test: parallel: 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 artifacts: expire_in: 2 weeks diff --git a/NodeApp/.gitlab-ci/09_stageUpload.yml b/NodeApp/.gitlab-ci/09_stageUpload.yml index 7d50365f4dda4a6af7c36d127d2287ebbf0e76c9..3cdbf6ffca1d5330163852675cbe4427ff53cf71 100644 --- a/NodeApp/.gitlab-ci/09_stageUpload.yml +++ b/NodeApp/.gitlab-ci/09_stageUpload.yml @@ -3,6 +3,7 @@ upload:packages: tags: - gitlab_package dependencies: + - build:version - pkg_and_sign:macos - pkg_and_sign:debian image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest