diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22c1c3af64345bd2875c0adc6a57dd95161be2cd..e55904fd2c9dc1ddf364a98b5c911f584960fd45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,13 +76,14 @@ variables: - npm install # Set version number shown in CLI - - sed -r "s/(\.version[ ]*\([ ]*\').*(\'[ ]*\))/\1${VERSION}\2/g" src/commander/CommanderApp.ts > src/commander/CommanderApp.ts + - sed -i -r "s/\{\{VERSION\}\}/${VERSION}/g" src/commander/CommanderApp.ts # Decrypt env vars for production - | if [ $CI_COMMIT_REF_PROTECTED == "true" ]; then echo "Decrypt production env vars" - sed -r "s/(\,(\n)?[]+)?(DOTENV_KEY[ ]*:[ ]*[\'\"\`])[^'\"\`]*([\'\"\`])//g" src/app.ts > src/app.ts; + sed -i -r "s/(DOTENV_KEY[ ]*:[ ]*[\'\"\`])[^'\"\`]*([\'\"\`])([ ]*\,)?//g" src/app.ts + sed -i -r "s/,[\ \n]*\}/\}/g" src/app.ts npx dotenv-vault local decrypt "${DOTENV_PROD_KEY}" > .env fi @@ -91,16 +92,16 @@ variables: # Build binaries ## macOS - - npx pkg . -t node18-macos-arm64 --output $BIN_FILE_MACOS_ARM64 --no-bytecode --public-packages "*" --public - - npx pkg . -t node18-macos-x64 --output $BIN_FILE_MACOS_X64 --no-bytecode --public-packages "*" --public + - npx pkg . -t node18-macos-arm64 --output $BIN_FILE_MACOS_ARM64 --no-bytecode --compress Brotli --public-packages "*" --public + - npx pkg . -t node18-macos-x64 --output $BIN_FILE_MACOS_X64 --no-bytecode --compress Brotli --public-packages "*" --public ## Linux - - npx pkg . -t node18-linuxstatic-arm64 --output $BIN_FILE_LINUX_ARM64 --no-bytecode --public-packages "*" --public - - npx pkg . -t node18-linuxstatic-x64 --output $BIN_FILE_LINUX_X64 --no-bytecode --public-packages "*" --public + - npx pkg . -t node18-linuxstatic-arm64 --output $BIN_FILE_LINUX_ARM64 --no-bytecode --compress Brotli --public-packages "*" --public + - npx pkg . -t node18-linuxstatic-x64 --output $BIN_FILE_LINUX_X64 --no-bytecode --compress Brotli --public-packages "*" --public ## Windows - - npx pkg . -t node18-win-arm64 --output $BIN_FILE_WINDOWS_ARM64 --no-bytecode --public-packages "*" --public - - npx pkg . -t node18-win-x64 --output $BIN_FILE_WINDOWS_X64 --no-bytecode --public-packages "*" --public + - npx pkg . -t node18-win-arm64 --output $BIN_FILE_WINDOWS_ARM64 --no-bytecode --compress Brotli --public-packages "*" --public + - npx pkg . -t node18-win-x64 --output $BIN_FILE_WINDOWS_X64 --no-bytecode --compress Brotli --public-packages "*" --public .sign_macos: diff --git a/NodeApp/src/commander/CommanderApp.ts b/NodeApp/src/commander/CommanderApp.ts index bc308adbff3f6cf406117af44d26b68b6a04beeb..91ba8fe932cea2e6085cf4ff554d030589cf7771 100644 --- a/NodeApp/src/commander/CommanderApp.ts +++ b/NodeApp/src/commander/CommanderApp.ts @@ -12,7 +12,7 @@ class CommanderApp { this.program .name('dojo') .description('CLI of the Dojo application') - .version('DEV') + .version('{{VERSION}}') .showHelpAfterError() .configureHelp({ showGlobalOptions: true,