Skip to content

Commit

Permalink
clean up deploy workflows (#1169)
Browse files Browse the repository at this point in the history
  • Loading branch information
kcinay055679 authored Nov 18, 2024
1 parent 6b1bda2 commit 260a3bd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/deploy-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ jobs:
- name: print imagetags
run: echo ${{ needs.read-version.outputs.okr-docker-image}}


e2e-docker:
runs-on: ubuntu-24.04
needs: [build-docker-image, read-version, get-e2e-files]
needs: [build-docker-image, read-version,get-e2e-files]
strategy:
fail-fast: false
matrix:
Expand All @@ -111,6 +110,11 @@ jobs:
-e SPRING_PROFILES_ACTIVE=integration-test \
${{ needs.read-version.outputs.okr-docker-image}} &
- name: set node version
uses: actions/setup-node@v4
with:
node-version: ${{vars.NODE_VERSION}}

- name: Cypress run e2e tests
uses: cypress-io/github-action@v6
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/staging-deploy-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
java-version: ${{vars.JAVA_VERSION}}
distribution: 'adopt'

- name: Set up node
- name: Set up node ${{vars.NODE_VERSION}}
uses: actions/setup-node@v4
with:
node-version: ${{vars.NODE_VERSION}}
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
${{ needs.update-version.outputs.okr-docker-image}} &
- name: set node version
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{vars.NODE_VERSION}}

Expand All @@ -153,18 +153,18 @@ jobs:
config: baseUrl=http://pitc.okr.localhost:8080
spec: cypress/e2e/${{ matrix.file }}


- uses: actions/upload-artifact@v4
if: always()
with:
name: cypress-screenshots ${{ matrix.file }}
name: cypress-screenshots for ${{ matrix.file }}
path: frontend/cypress/screenshots

upload-to-quay:
runs-on: ubuntu-latest
needs: [update-version, e2e-docker] #[e2e-docker, update-version]
steps:
- uses: actions/checkout@v4
- name: Checkout project
uses: actions/checkout@v4

- name: Download artifact
uses: actions/download-artifact@v4
Expand Down

0 comments on commit 260a3bd

Please sign in to comment.