diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index b6459ea98a3..c83e60b854e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -38,7 +38,7 @@ jobs: visual-test: name: Run visual e2e-tests - runs-on: macos-latest + runs-on: macos-15 timeout-minutes: 40 @@ -49,12 +49,12 @@ jobs: persist-credentials: false - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: 'package.json' - name: Use yarn cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: yarn-cache with: path: ./.yarn/cache @@ -65,7 +65,7 @@ jobs: run: yarn install --immutable - name: Use Playwright cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: playwright-cache with: path: | @@ -86,15 +86,13 @@ jobs: if: env.RUN_POST_BUILD == 'true' run: yarn workspace @dnb/eufemia postbuild:ci - # restore-keys: ${{ secrets.CACHE_VERSION }}-${{ runner.os }}-gatsby- - - name: Build portal run: yarn workspace dnb-design-system-portal build:visual-test - name: Run visual tests run: yarn workspace dnb-design-system-portal test:screenshots:ci - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: visual-test-artifact @@ -130,12 +128,12 @@ jobs: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: 'package.json' - name: Use node_modules cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: modules-cache with: path: '**/node_modules' @@ -146,7 +144,7 @@ jobs: run: yarn install --immutable - name: Use Playwright cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: playwright-cache with: path: | @@ -175,7 +173,7 @@ jobs: run: yarn workspace @dnb/eufemia test:e2e:ci - name: Store Playwright artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: playwright-develop-artifact diff --git a/.github/workflows/icons-lib.yml b/.github/workflows/icons-lib.yml index 780232b9674..403f5be7c2c 100644 --- a/.github/workflows/icons-lib.yml +++ b/.github/workflows/icons-lib.yml @@ -35,12 +35,12 @@ jobs: persist-credentials: false - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: 'package.json' - name: Use node_modules cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: modules-cache with: path: '**/node_modules' @@ -64,7 +64,7 @@ jobs: run: yarn workspace dnb-design-system-portal build:visual-test - name: Store portal artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: portal-build-artifact path: ./packages/dnb-design-system-portal/public @@ -87,12 +87,12 @@ jobs: persist-credentials: false - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: 'package.json' - name: Use yarn cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: yarn-cache with: path: ./.yarn/cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index baad1287b10..9a997d9e8a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,12 +40,12 @@ jobs: fetch-depth: 2 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: 'package.json' - name: Use node_modules cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: modules-cache with: path: '**/node_modules' @@ -70,7 +70,7 @@ jobs: - name: Deploy portal if: (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/portal') - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: personal_token: ${{ secrets.GH_TOKEN }} publish_dir: ./packages/dnb-design-system-portal/public diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 585df4e44a5..26aef7ea466 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -38,12 +38,12 @@ jobs: persist-credentials: false - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: 'package.json' - name: Use node_modules cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: modules-cache with: path: '**/node_modules' @@ -92,12 +92,12 @@ jobs: fetch-depth: 20 # The "postbuild:ci" method "getCommittedFiles" needs all history - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: 'package.json' - name: Use node_modules cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: modules-cache with: path: '**/node_modules' diff --git a/packages/dnb-design-system-portal/package.json b/packages/dnb-design-system-portal/package.json index 7a76e31e8e6..8cd70d83e41 100644 --- a/packages/dnb-design-system-portal/package.json +++ b/packages/dnb-design-system-portal/package.json @@ -26,11 +26,13 @@ "prettier:write": "prettier --log-level warn --write '**/*.{md,mdx,js,ts,tsx}'", "reset": "yarn clean && rm -rf ./node_modules", "serve": "gatsby serve -p 8000", + "serve:8001": "gatsby serve -p 8001", + "serve:8002": "gatsby serve -p 8002", "start": "cross-env NODE_OPTIONS=--max-old-space-size=8192 gatsby develop", "test": "jest", "test:ci": "jest --ci --passWithNoTests", "test:e2e:portal": "yarn playwright test", - "test:e2e:portal:ci": "start-server-and-test serve http://localhost:8000 test:e2e:portal", + "test:e2e:portal:ci": "start-server-and-test serve:8002 http://localhost:8002 test:e2e:portal", "test:e2e:portal:watch": "playwright test --ui", "test:screenshots": "yarn workspace @dnb/eufemia test:screenshots", "test:screenshots:ci": "start-server-and-test serve http://localhost:8000 'yarn workspace @dnb/eufemia test:screenshots:ci'", diff --git a/packages/dnb-design-system-portal/playwright.config.ts b/packages/dnb-design-system-portal/playwright.config.ts index 8d7680dddf9..fefaeb48f09 100644 --- a/packages/dnb-design-system-portal/playwright.config.ts +++ b/packages/dnb-design-system-portal/playwright.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ use: { // Base URL to use in actions like `await page.goto('/')`. - baseURL: 'http://localhost:8000', + baseURL: 'http://localhost:8002', // Name of the browser that runs tests. For example `chromium`, `firefox`, `webkit`. browserName: 'firefox', diff --git a/packages/dnb-eufemia/package.json b/packages/dnb-eufemia/package.json index a4db30b5ca9..2776dc2b8b9 100644 --- a/packages/dnb-eufemia/package.json +++ b/packages/dnb-eufemia/package.json @@ -79,7 +79,7 @@ "test:auto-generated-types": "yarn jest ./postTypeGeneration.test.ts --ci --testPathIgnorePatterns=[]", "test:ci": "yarn jest --ci", "test:e2e": "yarn playwright test", - "test:e2e:ci": "start-server-and-test 'yarn workspace dnb-design-system-portal serve' http://localhost:8000 test:e2e", + "test:e2e:ci": "start-server-and-test 'yarn workspace dnb-design-system-portal serve:8001' http://localhost:8001 test:e2e", "test:e2e:watch": "playwright test --ui", "test:postbuild": "yarn jest ./postbuild.test.ts --ci --testPathIgnorePatterns=[]", "test:screenshots": "yarn jest --config=./jest.config.screenshots.js --maxWorkers=1 --detectOpenHandles --testPathPattern ", diff --git a/packages/dnb-eufemia/playwright.config.ts b/packages/dnb-eufemia/playwright.config.ts index 3f1d7004c47..efa6ddadd12 100644 --- a/packages/dnb-eufemia/playwright.config.ts +++ b/packages/dnb-eufemia/playwright.config.ts @@ -9,7 +9,7 @@ export default defineConfig({ use: { // Base URL to use in actions like `await page.goto('/')`. - baseURL: 'http://localhost:8000', + baseURL: 'http://localhost:8001', // Name of the browser that runs tests. For example `chromium`, `firefox`, `webkit`. browserName: 'firefox',