Loading .gitlab-ci.yml +8 −37 Original line number Diff line number Diff line Loading @@ -137,18 +137,6 @@ stages: # List of stages for jobs, and their order of execution - upload - release config-job: # This job runs in the build stage, which runs first. stage: .pre extends: - main-branch-key - dev-branch-key - ttf-branch-key script: - echo $RELEASE_KEY - echo $RELEASE_PATH - echo $RELEASE_PAGE - exit 1 build-job: # This job runs in the build stage, which runs first. stage: build rules: Loading Loading @@ -198,6 +186,14 @@ prepare-job: - !reference [.default_rules, rules] script: - VERSION=`date +%Y%m%d.%H.%M` - | # Prepare a stable build (only web build?) if [ $CI_COMMIT_BRANCH == $MAIN_CI_TARGET_BRANCH ] then echo "RELEASE_KEY=$MAIN_KEY" >> variables.env echo "PACKAGE_NAME=$PACKAGE_NAME_MAIN" >> variables.env echo "RELEASE_PATH=public/updatesite/${RELEASE_KEY}" >> variables.env echo "RELEASE_PAGE=https://top.etsi.org/ide/updatesite/${RELEASE_KEY}" fi - echo "EXTRA_DESCRIPTION=automatic-release" >> variables.env - echo "VERSION=$VERSION" >> variables.env - echo "PACKAGE_REGISTRY_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ide/${VERSION}" >> variables.env Loading Loading @@ -303,28 +299,3 @@ release-job: # --assets-link "{\"name\":\"${WINDOWS_GUI_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WINDOWS_GUI_JAR}\"}" \ # --assets-link "{\"name\":\"${CLI_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${CLI_JAR}\"}" \ # --assets-link "{\"name\":\"${LIB_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LIB_JAR}\"}" # assign variables depending on the branch main-branch-key: variables: RELEASE_KEY: $MAIN_KEY rules: - if: $CI_COMMIT_BRANCH == $MAIN_CI_TARGET_BRANCH script: - echo $RELEASE_KEY dev-branch-key: variables: RELEASE_KEY: $BETA_KEY rules: - if: $CI_COMMIT_BRANCH == $DEV_CI_TARGET_BRANCH script: - echo $RELEASE_KEY ttf-branch-key: variables: RELEASE_KEY: $BETA_KEY rules: - if: $CI_COMMIT_BRANCH == "ttf-022" script: - echo $RELEASE_KEY Loading
.gitlab-ci.yml +8 −37 Original line number Diff line number Diff line Loading @@ -137,18 +137,6 @@ stages: # List of stages for jobs, and their order of execution - upload - release config-job: # This job runs in the build stage, which runs first. stage: .pre extends: - main-branch-key - dev-branch-key - ttf-branch-key script: - echo $RELEASE_KEY - echo $RELEASE_PATH - echo $RELEASE_PAGE - exit 1 build-job: # This job runs in the build stage, which runs first. stage: build rules: Loading Loading @@ -198,6 +186,14 @@ prepare-job: - !reference [.default_rules, rules] script: - VERSION=`date +%Y%m%d.%H.%M` - | # Prepare a stable build (only web build?) if [ $CI_COMMIT_BRANCH == $MAIN_CI_TARGET_BRANCH ] then echo "RELEASE_KEY=$MAIN_KEY" >> variables.env echo "PACKAGE_NAME=$PACKAGE_NAME_MAIN" >> variables.env echo "RELEASE_PATH=public/updatesite/${RELEASE_KEY}" >> variables.env echo "RELEASE_PAGE=https://top.etsi.org/ide/updatesite/${RELEASE_KEY}" fi - echo "EXTRA_DESCRIPTION=automatic-release" >> variables.env - echo "VERSION=$VERSION" >> variables.env - echo "PACKAGE_REGISTRY_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ide/${VERSION}" >> variables.env Loading Loading @@ -303,28 +299,3 @@ release-job: # --assets-link "{\"name\":\"${WINDOWS_GUI_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WINDOWS_GUI_JAR}\"}" \ # --assets-link "{\"name\":\"${CLI_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${CLI_JAR}\"}" \ # --assets-link "{\"name\":\"${LIB_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LIB_JAR}\"}" # assign variables depending on the branch main-branch-key: variables: RELEASE_KEY: $MAIN_KEY rules: - if: $CI_COMMIT_BRANCH == $MAIN_CI_TARGET_BRANCH script: - echo $RELEASE_KEY dev-branch-key: variables: RELEASE_KEY: $BETA_KEY rules: - if: $CI_COMMIT_BRANCH == $DEV_CI_TARGET_BRANCH script: - echo $RELEASE_KEY ttf-branch-key: variables: RELEASE_KEY: $BETA_KEY rules: - if: $CI_COMMIT_BRANCH == "ttf-022" script: - echo $RELEASE_KEY