diff --git a/.github/actions/cypress-cache/action.yaml b/.github/actions/cypress-cache/action.yaml index f191b78..9672ae7 100644 --- a/.github/actions/cypress-cache/action.yaml +++ b/.github/actions/cypress-cache/action.yaml @@ -4,7 +4,7 @@ runs: using: "composite" steps: # cache cypress runner - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cypress-cache with: path: /home/runner/.cache/Cypress diff --git a/.github/actions/lint/action.yaml b/.github/actions/lint/action.yaml index 12f9be3..0d62e65 100644 --- a/.github/actions/lint/action.yaml +++ b/.github/actions/lint/action.yaml @@ -3,7 +3,7 @@ description: verify linting rules runs: using: "composite" steps: - - uses: nrwl/nx-set-shas@v3 + - uses: nrwl/nx-set-shas@v4 - uses: './.github/actions/node-cache' - name: Install deps shell: bash diff --git a/.github/actions/node-cache/action.yaml b/.github/actions/node-cache/action.yaml index e312397..3a49e90 100644 --- a/.github/actions/node-cache/action.yaml +++ b/.github/actions/node-cache/action.yaml @@ -4,7 +4,7 @@ runs: using: "composite" steps: # cache node modules for all jobs to use - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: node_modules-cache with: path: | diff --git a/.github/actions/release/action.yaml b/.github/actions/release/action.yaml index 10c96f5..99043fa 100644 --- a/.github/actions/release/action.yaml +++ b/.github/actions/release/action.yaml @@ -17,9 +17,9 @@ runs: using: "composite" steps: - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - uses: './.github/actions/node-cache' - name: Install deps shell: bash diff --git a/.github/actions/test-e2e/action.yaml b/.github/actions/test-e2e/action.yaml index 7250d9f..45e984f 100644 --- a/.github/actions/test-e2e/action.yaml +++ b/.github/actions/test-e2e/action.yaml @@ -3,7 +3,7 @@ description: verify e2e tests runs: using: "composite" steps: - - uses: nrwl/nx-set-shas@v3 + - uses: nrwl/nx-set-shas@v4 - uses: './.github/actions/node-cache' - uses: './.github/actions/cypress-cache' - uses: './.github/actions/webpack-cache' diff --git a/.github/actions/test-unit/action.yaml b/.github/actions/test-unit/action.yaml index f410882..dea40f6 100644 --- a/.github/actions/test-unit/action.yaml +++ b/.github/actions/test-unit/action.yaml @@ -3,7 +3,7 @@ description: verify unit tests runs: using: "composite" steps: - - uses: nrwl/nx-set-shas@v3 + - uses: nrwl/nx-set-shas@v4 - uses: './.github/actions/node-cache' - name: Install deps shell: bash diff --git a/.github/actions/webpack-cache/action.yaml b/.github/actions/webpack-cache/action.yaml index a42ef45..8764357 100644 --- a/.github/actions/webpack-cache/action.yaml +++ b/.github/actions/webpack-cache/action.yaml @@ -4,7 +4,7 @@ runs: using: "composite" steps: # cache node modules for all jobs to use - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: webpack-cache with: path: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f445753..ede61ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,10 @@ jobs: install: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: nrwl/nx-set-shas@v3 + - uses: nrwl/nx-set-shas@v4 # cache node modules for all jobs to use - uses: './.github/actions/node-cache' # cache cypress runner @@ -24,7 +24,7 @@ jobs: needs: [install] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: './.github/actions/lint' @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest needs: [install] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: './.github/actions/test-unit' @@ -40,10 +40,10 @@ jobs: runs-on: ubuntu-latest needs: [install] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: nrwl/nx-set-shas@v3 + - uses: nrwl/nx-set-shas@v4 - uses: './.github/actions/node-cache' - name: Install deps run: npm i @@ -53,7 +53,7 @@ jobs: runs-on: ubuntu-latest needs: [install, build] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: './.github/actions/test-e2e' @@ -62,7 +62,7 @@ jobs: needs: [install, lint, test, build, test-e2e] if: github.event_name != 'pull_request' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 ssh-key: ${{ secrets.BOTH_AUTH_KEY }} diff --git a/e2e-script.js b/e2e-script.js index 4458945..3201217 100644 --- a/e2e-script.js +++ b/e2e-script.js @@ -18,18 +18,13 @@ execSync('npm run build', { cwd: cdnPath, stdio: 'inherit'}) const {result, commands} = concurrently( [{ - name: 'cdn-server', + name: 'assets servers', cwd: cdnPath, - command: 'npm run serve', - }, - { - cwd: __dirname, - name: 'test-app', - command: 'npx nx run test-app:serve', + command: 'npx concurrently "npm run serve" "npx nx run test-app:serve"', }, { cwd: __dirname, name: 'e2e', - command: 'npx wait-on federation-cdn-mock/dist http://localhost:4200 http://localhost:8001 -i 2000 && npx nx run test-app-e2e:e2e --skipNxCache', + command: 'echo "FOO BAR" && npx wait-on http://localhost:4200 http://127.0.0.1:8001 && npx nx run test-app-e2e:e2e --skipNxCache', }], { successCondition: 'e2e',