Update jar version

MTES-MCT · Oct 17, 2023 · d46c8ab · d46c8ab
1 parent 96bf240
commit d46c8ab
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,8 +1,8 @@
 name: "Release"
 
 on:
-  # push:
-  #   branches: ["main"]
+  push:
+    branches: ["main"]
   release:
     types: [published]
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ variables:
     value: rapportnav-v2
     description: "Nom du projet à déployer"
   PROJECT_VERSION:
-    value: "0.0.1-alpha.2"
+    value: "0.0.1-alpha.3"
     description: "Version du projet à déployer"
   SERVER_ENV_INT:
     value: "int-rapportnav-appli01"

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>fr.gouv.dgampa</groupId>
 	<artifactId>rapportnav</artifactId>
-	<version>VERSION_TO_CHANGE</version>
+	<version>0.0.1-alpha.3</version>
 	<name>RapportNav</name>
 	<description>RapportNav</description>
 	<properties>

diff --git a/ci/jobs/build_projet_maven.yml b/ci/jobs/build_projet_maven.yml
@@ -16,4 +16,4 @@ build_projet_maven:
     name: "Maven artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"
     when: on_success
     paths:
-      - "backend/target/rapportnav-VERSION_TO_CHANGE.jar"
+      - "backend/target/rapportnav-${PROJECT_VERSION}.jar"
diff --git a/ci/jobs/dependency-check.yml b/ci/jobs/dependency-check.yml
@@ -6,19 +6,19 @@ dependency_check:
   variables:
     HTTP_PROXY: "http://172.27.229.197:8090"
     HTTPS_PROXY: "http://172.27.229.197:8090"
-    NO_PROXY: "gitlab-sml.din.developpement-durable.gouv.fr,localhost,127.0.0.1,0.0.0.0,.dsi.damgm.i2"  
+    NO_PROXY: "gitlab-sml.din.developpement-durable.gouv.fr,localhost,127.0.0.1,0.0.0.0,.dsi.damgm.i2"
   script:
     - /usr/share/dependency-check/bin/dependency-check.sh --scan frontend/ --project "${PROJECT_NAME} ${PROJECT_VERSION}" --failOnCVSS 8 --proxyserver 172.27.229.197 --proxyport 8090
     - cd backend/target/
-    - /usr/share/dependency-check/bin/dependency-check.sh --scan rapportnav-VERSION_TO_CHANGE.jar --project "${PROJECT_NAME} ${PROJECT_VERSION}" --failOnCVSS 8 --proxyserver 172.27.229.197 --proxyport 8090
+    - /usr/share/dependency-check/bin/dependency-check.sh --scan rapportnav-${PROJECT_VERSION}.jar --project "${PROJECT_NAME} ${PROJECT_VERSION}" --failOnCVSS 8 --proxyserver 172.27.229.197 --proxyport 8090
   tags:
     - analyze
   artifacts:
-    when: on_success 
+    when: on_success
     paths:
       - backend/target/./dependency-check-report.html
       - dependency-check-report.html
   needs:
     - job: build_projet_maven
     - job: build_projet_npm
-      artifacts: true
+      artifacts: true
diff --git a/infra/docker/app/Dockerfile b/infra/docker/app/Dockerfile
@@ -15,7 +15,7 @@ ENV SPRING_PROFILES_ACTIVE=$ENV_PROFILE
 ENV ENV_DB_URL=""
 
 # copy backend related things
-COPY backend/target/rapportnav-VERSION_TO_CHANGE.jar /home/rapportnav
+COPY backend/target/rapportnav-${VERSION}}.jar /home/rapportnav
 COPY infra/configurations/backend /home/rapportnav/configurations/