Skip to content

Commit

Permalink
Organiser apper (#809)
Browse files Browse the repository at this point in the history
* Organiser apper

* Formater settings.gradle.kts

* Oppdater workflow for integrasjonstest
  • Loading branch information
bjerga authored Dec 18, 2024
1 parent 7cc5b3c commit 56a2f4e
Show file tree
Hide file tree
Showing 426 changed files with 18 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
id: app_jar
uses: andstor/file-existence-action@v3
with:
files: "${{ matrix.project }}/build/libs/app.jar"
files: "apps/${{ matrix.project }}/build/libs/app.jar"

- name: Create docker tag
if: steps.app_jar.outputs.files_exists == 'true'
Expand All @@ -128,7 +128,7 @@ jobs:
- name: Build docker image
if: steps.app_jar.outputs.files_exists == 'true'
run: docker build ${{ matrix.project }} --pull -t $IMAGE -f Dockerfile
run: docker build apps/${{ matrix.project }} --pull -t $IMAGE -f Dockerfile

- name: Push docker image
if: steps.app_jar.outputs.files_exists == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integrasjonstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Generate matrix
id: set-matrix
run: |
TESTS=$(find ./integrasjonstest/ -name "*IT.kt" -exec basename {} .kt \; | jq -R -s -c 'split("\n")[:-1]' | jq -c '{"test": .}')
TESTS=$(find ./apps/integrasjonstest/ -name "*IT.kt" -exec basename {} .kt \; | jq -R -s -c 'split("\n")[:-1]' | jq -c '{"test": .}')
echo "matrix=${TESTS}" >> $GITHUB_OUTPUT
integrasjonstest:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
id: app_jar
uses: andstor/file-existence-action@v3
with:
files: "${{ matrix.project }}/build/libs/app.jar"
files: "apps/${{ matrix.project }}/build/libs/app.jar"

- name: Create docker tag
if: steps.app_jar.outputs.files_exists == 'true'
Expand All @@ -130,7 +130,7 @@ jobs:
- name: Build docker image
if: steps.app_jar.outputs.files_exists == 'true'
run: docker build ${{ matrix.project }} --pull -t $IMAGE -f Dockerfile
run: docker build apps/${{ matrix.project }} --pull -t $IMAGE -f Dockerfile

- name: Push docker image
if: steps.app_jar.outputs.files_exists == 'true'
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 56a2f4e

Please sign in to comment.