Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: npm run build

- name: Type check
run: tsc --noEmit
run: npx tsc --noEmit

- name: ESLint
run: npm run lint:eslint
Expand Down
27 changes: 25 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@ on:
push:
pull_request:
types: [opened, reopened, synchronize]
workflow_dispatch:
inputs:
coverage-branch:
description: 'Branch whose Coveralls baseline should be rebuilt'
required: true
default: develop
type: string

env:
E2E_DATAVERSE_IMAGE_TAG: unstable

jobs:
e2e:
if: github.event_name != 'workflow_dispatch'
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -79,6 +87,13 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ inputs.coverage-branch || '' }}

- name: Identify baseline source commit
if: github.event_name == 'workflow_dispatch'
id: coverage-source
run: echo "commit=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"

- uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -112,14 +127,22 @@ jobs:
run: npm run test:coverage-all

- name: Merge coverage
run: npm run test:coverage-merge
# Keep the corrected merge logic when rebuilding an older branch's baseline.
run: |
test -s coverage/lcov.info
test -s packages/design-system/coverage/lcov.info
mkdir -p merged-coverage
./node_modules/.bin/lcov-result-merger '{coverage,packages/design-system/coverage}/lcov.info' 'merged-coverage/lcov.info' --prepend-source-files

- name: Upload coverage report to Coveralls
if: always()
uses: coverallsapp/github-action@v2
with:
path-to-lcov: './merged-coverage/lcov.info'
github-token: ${{ secrets.GITHUB_TOKEN }}
# Re-runs must create a fresh build instead of reusing a finalized report.
build-number: ${{ github.run_id }}-${{ github.run_attempt }}
git-branch: ${{ inputs.coverage-branch || '' }}
git-commit: ${{ steps.coverage-source.outputs.commit || '' }}

- name: Upload Cypress screenshots
uses: actions/upload-artifact@v4
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# testing
/.nyc_output
/coverage
/merged-coverage
/cypress
.nyc_output
/packages/design-system/coverage
Expand Down Expand Up @@ -132,4 +133,4 @@ dist/
# Keycloakify
#################
keycloakify-dev-resources
dist_keycloak
dist_keycloak
1 change: 0 additions & 1 deletion dev-env/docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ services:
build:
context: ../
dockerfile: ./dev.Dockerfile
network: host
expose:
- '5173'
stdin_open: true
Expand Down
4 changes: 0 additions & 4 deletions dev-env/run-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ export DATAVERSE_IMAGE_TAG=$1
# To avoid timeout issues on frontend container startup
export COMPOSE_HTTP_TIMEOUT=200

# Newer Docker Compose builds with Bake by default, which rejects the frontend's
# `network: host` build option unless --allow=network.host is passed
export COMPOSE_BAKE=false

# Timeout for Dataverse bootstrap configbaker
export DATAVERSE_BOOTSTRAP_TIMEOUT="10m"

Expand Down
Loading
Loading