OK-567 Build ovara-suoritusrekisteri

Opetushallitus · Jun 28, 2024 · 9844148 · 9844148
1 parent ccb8dea
commit 9844148
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,12 +74,19 @@ jobs:
         run: |
           git clone https://github.com/Opetushallitus/ci-tools.git
           source ci-tools/common/setup-tools.sh
-          export ARTIFACT_NAME="suoritusrekisteri"
-          mv target/suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar 
-          jar xf $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar META-INF/native
+          mv suoritusrekisteri/target/suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/suoritusrekisteri.jar 
+          jar xf $DOCKER_BUILD_DIR/artifact/suoritusrekisteri.jar META-INF/native
           mv META-INF/native $DOCKER_BUILD_DIR/native_libs
-          cp -vr src/main/resources/* $DOCKER_BUILD_DIR/config/
+          cp -vr suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
+          
+          ./ci-tools/common/clean-docker-build-dir.sh
+          mv ovara-suoritusrekisteri/target/ovara-suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar 
+          jar xf $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar META-INF/native
+          mv META-INF/native $DOCKER_BUILD_DIR/native_libs
+          cp -vr ovara-suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
+          
           export BASE_IMAGE="baseimage-fatjar-openjdk11:master"
           ./ci-tools/common/pull-image.sh
-          ./ci-tools/github-build/build-fatjar.sh $ARTIFACT_NAME
-          ./ci-tools/github-build/upload-image.sh $ARTIFACT_NAME
+          ./ci-tools/github-build/build-fatjar.sh suoritusrekisteri
+          ./ci-tools/github-build/upload-image.sh suoritusrekisteri
+          ./ci-tools/github-build/upload-image.sh ovara-suoritusrekisteri