Commit 0283fe31 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

MR for Release 2024Q4

Closes #34

See merge request !46
parents f6537672 bb3669f0

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ include: 


  - local: ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'

      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED == "true"'



  - local: ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED != "true"'





maven_build:

ci-templates/build.yml

+2 −2
Original line number Diff line number Diff line 
.maven_build:

  extends: .default

  stage: build

  image: maven:3.9.5-ibm-semeru-17-focal

  image: maven:3.9.9-ibm-semeru-17-focal

  script:

    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION

  artifacts:
@@ -26,7 +26,7 @@ 
.angular_build:

  extends: .default

  stage: build

  image: trion/ng-cli:14.2.6

  image: trion/ng-cli:13.3.7

  script:

    - |

      if [ ! -f  "./src/assets/config/theming.scss" ]; then

ci-templates/build_unprotected.yml

+2 −2
Original line number Diff line number Diff line 
.maven_build:

  extends: .default

  stage: build

  image: maven:3.9.5-ibm-semeru-17-focal

  image: maven:3.9.9-ibm-semeru-17-focal

  script:

    - mvn install -s ci_settings.xml

  artifacts:
@@ -20,7 +20,7 @@ 
.angular_build:

  extends: .default

  stage: build

  image: trion/ng-cli:14.2.6

  image: trion/ng-cli:13.3.7

  script:

    - |

      if [ ! -f  "./src/assets/config/theming.scss" ]; then

ci-templates/default.yml

+12 −1
Original line number Diff line number Diff line
@@ -7,11 +7,22 @@ stages: 


.default:

  before_script:

    - set -e

    - |

      if [ "$CI_COMMIT_REF_PROTECTED" = true ] && [ -n "$CI_COMMIT_TAG" ]; then

        export APP_VERSION=$CI_COMMIT_TAG

      elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then

        export APP_VERSION="develop"

      else

        export APP_VERSION=$CI_COMMIT_REF_NAME

        # Replace '/' with '-' and check for any invalid characters

        APP_VERSION=$(echo "$CI_COMMIT_REF_NAME" | sed 's|/|-|g')

        

        # Check for invalid characters (only allow lowercase and uppercase letters, digits, '_', '.', '-')

        if echo "$APP_VERSION" | grep -q '[^a-zA-Z0-9._-]'; then

          echo "Error: Branch name contains invalid characters for Docker tags. Only a-z, A-Z, 0-9, '_', '.', and '-' are allowed."

          exit 1

        fi



        export APP_VERSION

      fi

    - echo "APP_VERSION set to $APP_VERSION"

compose/deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ updaterepo(){ 


        # Build maven project if .pom file is present

        if [ -f  "./pom.xml" ]; then

            docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.5-ibm-semeru-17-focal mvn clean verify -DskipTests

            docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.9-ibm-semeru-17-focal mvn clean verify -DskipTests

        fi

}