From 28e77e5110be2c13a696aa86bb1d6856d6cfcc63 Mon Sep 17 00:00:00 2001
From: DEMAREST Maxime <maxime@indelog.fr>
Date: Fri, 16 Feb 2024 15:31:51 +0100
Subject: [PATCH] [fix] gitlab-ci
---
.gitlab-ci.yml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 968051b..22700c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ variables:
image: ${CI_BUILD_IMAGE}
tags: [ kepler ]
before_script:
- - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
+ # - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
# Get project dependencies
- ls -artl "${BUILD_CACHE_DIR}"
- ln -s "${BUILD_CACHE_DIR}/node_modules" node_modules
@@ -96,18 +96,20 @@ variables:
image: ${CI_BUILD_ELECTRON_IMAGE}
tags: [ kepler ]
before_script:
- - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
+ # - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
- npm install
- npm run electron:install
+ - npm version
.configure-webext-template: &webext-setup
image: ${CI_BUILD_IMAGE}
tags: [ kepler ]
before_script:
- - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
+ # - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
- ls -artl "${BUILD_CACHE_DIR}"
- ln -s "${BUILD_CACHE_DIR}/node_modules" node_modules
- npm install web-ext
+ - npm version
# ---------------------------------------------------------------
# Environment jobs : Create docker image for builds/release, this
@@ -354,7 +356,7 @@ gitlab-release:
needs: [release]
image: ${CI_BUILD_IMAGE}
script:
- - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
+ # - if [[ -n ${APP_VERSION} ]]; then git checkout ${APP_VERSION} ; fi
# Copy cached dependencies and build
- ls -artl "${BUILD_CACHE_DIR}"
- ln -s "${BUILD_CACHE_DIR}/node_modules" node_modules
@@ -371,6 +373,7 @@ gitlab-release:
- if ! zip -q -r "${releaseFile}" . ; then echo "Cannot create the archive for the web artifact"; exit 1; fi
- cd ${CI_PROJECT_DIR}
- npm run release:upload_file --token=${CI_JOB_TOKEN} "${CI_PROJECT_NAME}" "${APP_VERSION}" "${releaseFile}" "link_release"
+ - npm version
artifacts:
paths:
- release
--
GitLab