Skip to content

Commit f116362

Browse files
valorkinvalorkin
committed
chore: update github action versions
1 parent fb1d295 commit f116362

File tree

2 files changed

+33
-34
lines changed

2 files changed

+33
-34
lines changed

‎.github/workflows/on-push-or-pull.yml‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-22.04
2929
steps:
3030
- name: Cancel Previous Runs
31-
uses: styfle/cancel-workflow-action@0.11.0
31+
uses: styfle/cancel-workflow-action@0.12.1
3232
with:
3333
access_token: ${{ secrets.GITHUB_TOKEN }}
3434

@@ -37,8 +37,8 @@ jobs:
3737
runs-on: ubuntu-22.04
3838
needs: one_run
3939
steps:
40-
- uses: actions/checkout@v3
41-
- uses: actions/cache@v3
40+
- uses: actions/checkout@v4
41+
- uses: actions/cache@v4
4242
id: cache
4343
with:
4444
path: ${{ env.CACHE_NODE_MODULES_PATH }}
@@ -51,12 +51,12 @@ jobs:
5151
needs: install
5252
runs-on: ubuntu-22.04
5353
steps:
54-
- uses: actions/checkout@v3
55-
- uses: actions/cache@v3
54+
- uses: actions/checkout@v4
55+
- uses: actions/cache@v4
5656
with:
5757
path: ${{ env.CACHE_NODE_MODULES_PATH }}
5858
key: node_modules-${{ hashFiles('**/package-lock.json') }}
59-
- uses: actions/cache@v3
59+
- uses: actions/cache@v4
6060
with:
6161
path: ${{ env.CACHE_DIST_PATH }}
6262
key: dist-${{ github.run_id }}
@@ -73,12 +73,12 @@ jobs:
7373
runs-on: ubuntu-22.04
7474
needs: build
7575
steps:
76-
- uses: actions/checkout@v3
77-
- uses: actions/cache@v3
76+
- uses: actions/checkout@v4
77+
- uses: actions/cache@v4
7878
with:
7979
path: ${{ env.CACHE_NODE_MODULES_PATH }}
8080
key: node_modules-${{ hashFiles('**/package-lock.json') }}
81-
- uses: actions/cache@v3
81+
- uses: actions/cache@v4
8282
with:
8383
path: ${{ env.CACHE_DIST_PATH }}
8484
key: dist-${{ github.run_id }}
@@ -92,22 +92,23 @@ jobs:
9292
runs-on: ubuntu-22.04
9393
needs: install
9494
steps:
95-
- uses: actions/checkout@v3
96-
- uses: actions/cache@v3
95+
- uses: actions/checkout@v4
96+
- uses: actions/cache@v4
9797
with:
9898
path: ${{ env.CACHE_NODE_MODULES_PATH }}
9999
key: node_modules-${{ hashFiles('**/package-lock.json') }}
100100
# - run: npm run lint -- --runner=cloud
101101
- run: npm run lint --
102102

103-
# get cloudflare pages preview url (for git integration)
104-
cloudflare_preview_url:
103+
# deploy to cloudflare pages
104+
cloudflare_deploy:
105105
runs-on: ubuntu-22.04
106106
needs: build
107107
outputs:
108-
preview_url: ${{ steps.get_preview_url.outputs.preview_url }}
108+
deployment_url: ${{ steps.cloudflare_deploy.outputs.deployment-url }}
109+
preview_url: ${{ steps.extract_preview_url.outputs.preview_url }}
109110
steps:
110-
- uses: actions/checkout@v3
111+
- uses: actions/checkout@v4
111112

112113
# Wait for Cloudflare deployment with intelligent polling
113114
- name: Wait for Cloudflare deployment
@@ -155,9 +156,9 @@ jobs:
155156
- name: Set preview URL output
156157
id: get_preview_url
157158
run: |
158-
if [ -n "${{ steps.wait_deployment.outputs.deployment_url }}" ]; then
159+
if [ -n "${{ steps.cloudflare_deploy.outputs.deployment-url }}" ]; then
159160
# Extract just the hostname from the full URL
160-
PREVIEW_URL=$(echo "${{ steps.wait_deployment.outputs.deployment_url }}" | sed 's|https://||')
161+
PREVIEW_URL=$(echo "${{ steps.cloudflare_deploy.outputs.deployment-url }}" | sed 's|https://||')
161162
echo "preview_url=$PREVIEW_URL" >> $GITHUB_OUTPUT
162163
echo "Preview URL: https://$PREVIEW_URL"
163164
else
@@ -168,19 +169,19 @@ jobs:
168169
e2e_smoke:
169170
name: e2e smoke (${{ matrix.shard }}/${{ strategy.job-total }})
170171
runs-on: ubuntu-22.04
171-
needs: [install, build, cloudflare_preview_url]
172+
needs: [install, build, cloudflare_deploy]
172173

173174
strategy:
174175
fail-fast: false
175176
matrix:
176177
shard: [1, 2]
177178
steps:
178-
- uses: actions/checkout@v3
179-
- uses: actions/cache@v3
179+
- uses: actions/checkout@v4
180+
- uses: actions/cache@v4
180181
with:
181182
path: ${{ env.CACHE_NODE_MODULES_PATH }}
182183
key: node_modules-${{ hashFiles('**/package-lock.json') }}
183-
- uses: actions/cache@v3
184+
- uses: actions/cache@v4
184185
with:
185186
path: ${{ env.CACHE_DIST_PATH }}
186187
key: dist-${{ github.run_id }}
@@ -191,11 +192,11 @@ jobs:
191192
npx playwright install-deps chromium
192193
193194
- name: smoke e2e on cloudflare pages
194-
if: ${{ needs.cloudflare_preview_url.outputs.preview_url }}
195-
run: PLAYWRIGHT_TEST_BASE_URL="https://${{ needs.cloudflare_preview_url.outputs.preview_url }}" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
195+
if: ${{ needs.cloudflare_deploy.outputs.preview_url }}
196+
run: PLAYWRIGHT_TEST_BASE_URL="https://${{ needs.cloudflare_deploy.outputs.preview_url }}" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
196197

197198
- name: smoke e2e local
198-
if: ${{ !needs.cloudflare_preview_url.outputs.preview_url }}
199+
if: ${{ !needs.cloudflare_deploy.outputs.preview_url }}
199200
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --shard=${{ matrix.shard }}/${{ strategy.job-total }}
200201

201202
- uses: actions/upload-artifact@v4
@@ -208,19 +209,19 @@ jobs:
208209
e2e_full:
209210
name: e2e full
210211
runs-on: ubuntu-22.04
211-
needs: [e2e_smoke, cloudflare_preview_url]
212+
needs: [e2e_smoke, cloudflare_deploy]
212213

213214
strategy:
214215
fail-fast: false
215216
matrix:
216217
shard: [1, 2]
217218
steps:
218-
- uses: actions/checkout@v3
219-
- uses: actions/cache@v3
219+
- uses: actions/checkout@v4
220+
- uses: actions/cache@v4
220221
with:
221222
path: ${{ env.CACHE_NODE_MODULES_PATH }}
222223
key: node_modules-${{ hashFiles('**/package-lock.json') }}
223-
- uses: actions/cache@v3
224+
- uses: actions/cache@v4
224225
with:
225226
path: ${{ env.CACHE_DIST_PATH }}
226227
key: dist-${{ github.run_id }}
@@ -231,12 +232,12 @@ jobs:
231232
npx playwright install-deps chromium
232233
233234
- name: full e2e on cloudflare pages
234-
if: ${{ needs.cloudflare_preview_url.outputs.preview_url }}
235+
if: ${{ needs.cloudflare_deploy.outputs.preview_url }}
235236
continue-on-error: true
236-
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-full --baseUrl=https://${{ needs.cloudflare_preview_url.outputs.preview_url }} --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
237+
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-full --baseUrl=https://${{ needs.cloudflare_deploy.outputs.preview_url }} --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
237238

238239
- name: full e2e on local
239-
if: ${{ !needs.cloudflare_preview_url.outputs.preview_url }}
240+
if: ${{ !needs.cloudflare_deploy.outputs.preview_url }}
240241
continue-on-error: true
241242
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-full --shard=${{ matrix.shard }}/${{ strategy.job-total }}
242243

‎package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
"dev:ssr": "ng run ngx-bootstrap-docs:serve-ssr",
5050
"serve:ssr": "node dist/ngx-bootstrap-docs/server/main.js",
5151
"build:ssr": "ng build && ng run ngx-bootstrap-docs:server",
52-
"prerender": "ng run ngx-bootstrap-docs:prerender",
53-
"build:cf": "nx run ngx-bootstrap-docs:build-with-404-fix",
54-
"fix-404": "node scripts/fix-404.js"
52+
"prerender": "ng run ngx-bootstrap-docs:prerender"
5553
},
5654
"private": true,
5755
"keywords": [

0 commit comments

Comments
 (0)