diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 82c99b58..3cd6ee46 100644
--- 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
index d404a9e3..e720a022 100644
--- 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
index 2b17a55c..e4e64558 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -10,7 +10,7 @@
fr.gouv.dgampa
rapportnav
- VERSION_TO_CHANGE
+ 0.0.1-alpha.3
RapportNav
RapportNav
diff --git a/ci/jobs/build_projet_maven.yml b/ci/jobs/build_projet_maven.yml
index edca148c..bb975028 100644
--- 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
index d2057cbe..2173873f 100644
--- 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
\ No newline at end of file
+ artifacts: true
diff --git a/infra/docker/app/Dockerfile b/infra/docker/app/Dockerfile
index 816a7550..cf792dad 100644
--- 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/