From 133d8e44ee2cd84dced6958f8782c700984fbd6e Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Fri, 7 Mar 2025 11:36:42 +0100 Subject: [PATCH 1/2] chore: switch e2e workflow runner from Ubuntu to macOS --- .github/workflows/e2e.yml | 13 +++++++------ .github/workflows/nodejs.yml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 91ac58a..b312b05 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -4,8 +4,8 @@ on: workflow_call: jobs: - e2etest: - runs-on: ubuntu-latest + e2e: + runs-on: macos-latest strategy: matrix: project: [chromium, firefox, webkit] @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 22.x + node-version-file: package.json - name: Install dependencies run: npm ci - name: Install Playwright @@ -28,6 +28,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: test-results-${{ matrix.project }} - path: test-results - \ No newline at end of file + name: playwright-${{ matrix.project }} + path: | + test-results + playwright-report \ No newline at end of file diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index ad0b97a..3709b09 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 20.x + node-version-file: package.json - name: Install dependencies run: npm ci - name: Run ESLint From 24accbb9e266940dcd9e71d90eaa3595caccb752 Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Fri, 7 Mar 2025 11:37:53 +0100 Subject: [PATCH 2/2] chore: rename job name from 'e2etest' to 'e2e' --- .github/workflows/dev-build.yml | 6 +++--- .github/workflows/dev-check.yml | 2 +- .github/workflows/release-please.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 841cd44..e15384c 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -1,7 +1,7 @@ # This worklflow will perform following actions when the code is pushed to development branch: # - Run end to end test. # - Check Linting. -# - Build the latest docker image in development which needs both e2etest and lint to pass first. +# - Build the latest docker image in development which needs both e2e and lint to pass first. # - Push the latest docker image to Google Artifact Registry-Dev. # - Rollout the latest image in GKE. # @@ -26,7 +26,7 @@ env: REPOSITORY_NAMESPACE: nfdi4chem jobs: - e2etest: + e2e: uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/e2e.yml@main lint: @@ -36,7 +36,7 @@ jobs: name: Deploy to dev if: github.ref == 'refs/heads/development' runs-on: ubuntu-latest - needs: [lint, e2etest] + needs: [lint, e2e] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/dev-check.yml b/.github/workflows/dev-check.yml index 8413a51..25cbfe7 100644 --- a/.github/workflows/dev-check.yml +++ b/.github/workflows/dev-check.yml @@ -6,7 +6,7 @@ on: - development jobs: - e2etest: + e2e: uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/e2e.yml@main lint: uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/nodejs.yml@main diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index e1ec2d2..7bb52cc 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -2,7 +2,7 @@ # This worklflow will perform following actions when the code is pushed to main branch. # - Run end to end test # - Test linting. -# - Trigger release-please action to create release which needs e2etest & lint to pass first. +# - Trigger release-please action to create release which needs e2e & lint to pass first. # # Maintainers: # - name: Nisha Sharma @@ -16,7 +16,7 @@ on: - main jobs: - e2etest: + e2e: uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/e2e.yml@main lint: @@ -24,7 +24,7 @@ jobs: release-please: runs-on: ubuntu-latest - needs: ['lint', 'e2etest'] + needs: ['lint', 'e2e'] steps: - uses: google-github-actions/release-please-action@v3 with: