Skip to content

Commit 3a1f75c

Browse files
committed
OK-567 Build ovara-suoritusrekisteri
1 parent ccb8dea commit 3a1f75c

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
with:
2929
node-version-file: '.nvmrc'
3030
cache: 'npm'
31+
cache-dependency-path: suoritusrekisteri/package-lock.json
3132

3233
- name: Run NPM
3334
run: |
@@ -49,7 +50,8 @@ jobs:
4950
id: restore-build
5051
with:
5152
path: |
52-
target
53+
suoritusrekisteri/target
54+
ovara-suoritusrekisteri/target
5355
key: ${{ github.sha }}
5456

5557
deploy-container:
@@ -63,7 +65,8 @@ jobs:
6365
id: restore-build
6466
with:
6567
path: |
66-
target
68+
suoritusrekisteri/target
69+
ovara-suoritusrekisteri/target
6770
key: ${{ github.sha }}
6871

6972
- name: Build Docker container
@@ -74,12 +77,19 @@ jobs:
7477
run: |
7578
git clone https://github.com/Opetushallitus/ci-tools.git
7679
source ci-tools/common/setup-tools.sh
77-
export ARTIFACT_NAME="suoritusrekisteri"
78-
mv target/suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar
79-
jar xf $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar META-INF/native
80+
mv suoritusrekisteri/target/suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/suoritusrekisteri.jar
81+
jar xf $DOCKER_BUILD_DIR/artifact/suoritusrekisteri.jar META-INF/native
8082
mv META-INF/native $DOCKER_BUILD_DIR/native_libs
81-
cp -vr src/main/resources/* $DOCKER_BUILD_DIR/config/
83+
cp -vr suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
84+
85+
./ci-tools/common/clean-docker-build-dir.sh
86+
mv ovara-suoritusrekisteri/target/ovara-suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar
87+
jar xf $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar META-INF/native
88+
mv META-INF/native $DOCKER_BUILD_DIR/native_libs
89+
cp -vr ovara-suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
90+
8291
export BASE_IMAGE="baseimage-fatjar-openjdk11:master"
8392
./ci-tools/common/pull-image.sh
84-
./ci-tools/github-build/build-fatjar.sh $ARTIFACT_NAME
85-
./ci-tools/github-build/upload-image.sh $ARTIFACT_NAME
93+
./ci-tools/github-build/build-fatjar.sh suoritusrekisteri
94+
./ci-tools/github-build/upload-image.sh suoritusrekisteri
95+
./ci-tools/github-build/upload-image.sh ovara-suoritusrekisteri

0 commit comments

Comments
 (0)