Skip to content

Commit

Permalink
Merge branch 'main' into 1987-view-topic-events-range-backend
Browse files Browse the repository at this point in the history
  • Loading branch information
khatibtamal committed Aug 21, 2024
2 parents 7766bbb + 0fdec2d commit 622b915
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Set up JDK 19
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
with:
java-version: 19
distribution: 'temurin'
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/end-to-end-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
${{ runner.os }}-pnpm-store-
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
with:
java-version: 20
distribution: 'temurin'
Expand Down Expand Up @@ -87,6 +87,7 @@ jobs:
# be immediately ready to accept connections, so the retry makes sure
# we're giving it (hopefully) enough time to be ready.
- name: Make sure Klaw is reachable
id: klaw-build-reachable
run: |
retries=5 # Number of retries
interval=5 # Initial retry interval in seconds
Expand Down Expand Up @@ -125,19 +126,15 @@ jobs:
run: pnpm playwright install --with-deps chromium

- name: Run Playwright tests
id: playwright-test-run
working-directory: ./e2e
run: BASE_URL=http://${{ steps.containerIp.outputs.CONTAINER_IP }}:9097 pnpm __test

- name: Upload Playwright artifacts
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
# Upload whether steps before where a failure, but only when the playwright tests did run
# This way we make sure we don't attempt to upload files that are not there, bc.
# for example the build has failed.
if: ${{ always() && steps.playwright-test-run.status == 'completed' }}
if: ${{ !cancelled() }}
with:
name: playwright-report
path: playwright-report/
path: ./e2e/playwright-report/
retention-days: 5

- name: Teardown Klaw
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jobs-maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Install node.js uglify packages
run: npm install uglify-js -g && npm install uglifycss -g
- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
with:
distribution: 'temurin'
java-version: ${{ matrix.java-version }}
Expand Down

0 comments on commit 622b915

Please sign in to comment.