Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organiser apper #809

Merged
merged 3 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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.
Loading
Loading