CI/CD => Add DOTENV_KEY for production

.gitlab-ci.yml

@@ -3,6 +3,8 @@ variables:
     GIT_SUBMODULE_FORCE_HTTPS: "true"
     SECURE_FILES_DOWNLOAD_PATH: './'
 
+    PROJECT_NAME: DojoCLI
+
     BIN_NAME: dojo
 
     MACOS_PKG_EXTENSION: '.pkg'
@@ -62,18 +64,14 @@ variables:
         - PACKAGE_URL_MACOS_X64_PKG="${PACKAGE_REGISTRY_URL}_macOS-pkg-x64/${VERSION}/${MACOS_PKG_BIN_NAME}"
 
         # Wiki
-        - WIKI_ARCHIVE_NAME="DojoCLI_Wiki_${VERSION}.tar.xz"
-        - PACKAGE_URL_WIKI="${PACKAGE_REGISTRY_URL}_Windows-x64/${VERSION}/${WIKI_ARCHIVE_NAME}"
+        - WIKI_ARCHIVE_NAME="${PROJECT_NAME}_Wiki_${VERSION}.tar.xz"
+        - PACKAGE_URL_WIKI="${PACKAGE_REGISTRY_URL}_Wiki/${VERSION}/${WIKI_ARCHIVE_NAME}"
 
 
 .build_cli:
     script:
         - cd NodeApp
 
-        # Download secure files
-        - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
-        - mv env_$VERSION .env
-
         # Install dependencies
         - npm install
         - npm run build
@@ -155,7 +153,7 @@ test:build:
         # Build
         - !reference [.build_cli, script]
     rules:
-        - if: '$CI_COMMIT_TAG =~ "/^$/" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH !~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
 
 
 build:version:
@@ -170,6 +168,10 @@ build:version:
         - mkdir -p $ARTIFACTS_FOLDER
         - echo $VERSION > $VERSION_FILE
 
+        - |
+            echo "Replace DOTENV_KEY if we are on a protected branch" # Hide the print of the DOTENV_PROD_KEY
+            sed -r "s/(DOTENV_KEY[ ]*:[ ]*[\'\"\`])[^'\"\`]*([\'\"\`])/\${DOTENV_PROD_KEY}\2/g" src/app.ts > src/app.ts;
+
         # Build
         - !reference [.build_cli, script]
     artifacts:
@@ -178,7 +180,7 @@ build:version:
             - $ARTIFACTS_FOLDER/*
         expire_in: 1 hour
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
 
 
 sign:macos:
@@ -203,7 +205,7 @@ sign:macos:
             - $ARTIFACTS_FOLDER/*
         expire_in: 1 hour
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
 
 
 clean:release:
@@ -215,7 +217,7 @@ clean:release:
         - !reference [.get_version, script]
         - !reference [.clean_release, script]
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
 
 
 clean:packages:
@@ -227,7 +229,7 @@ clean:packages:
         - !reference [.get_version, script]
         - !reference [.clean_packages, script]
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
 
 
 clean:dev:release:
@@ -281,7 +283,7 @@ upload:packages:
         - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${BIN_FILE_WINDOWS_ARM64} "${PACKAGE_URL_WINDOWS_ARM64_BIN}";'
         - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${BIN_FILE_WINDOWS_X64} "${PACKAGE_URL_WINDOWS_X64_BIN}";'
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
 
 
 upload:packages:wiki:
@@ -304,7 +306,7 @@ upload:packages:wiki:
         # Send package
         - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${WIKI_ARCHIVE_PATH} "${PACKAGE_URL_WIKI}";'
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
 
 
 release:wiki:
@@ -414,4 +416,4 @@ release:gitlab:
               --header "JOB-TOKEN: $CI_JOB_TOKEN" \
               --request POST "${GITLAB_API_PROJECT_URL}/releases"
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
+        - if: '$CI_COMMIT_REF_PROTECTED == "true"'
\ No newline at end of file