Skip to content

Commit

Permalink
chore: update actions images
Browse files Browse the repository at this point in the history
  • Loading branch information
Hyperkid123 committed May 10, 2024
1 parent 9423019 commit 9895768
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/actions/cypress-cache/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/lint/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/node-cache/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/release/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-e2e/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-unit/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/webpack-cache/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,26 +24,26 @@ jobs:
needs: [install]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: './.github/actions/lint'
test:
runs-on: ubuntu-latest
needs: [install]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: './.github/actions/test-unit'
build:
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
Expand All @@ -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'
Expand All @@ -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 }}
Expand Down
11 changes: 3 additions & 8 deletions e2e-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 9895768

Please sign in to comment.