Skip to content

Commit b43feff

Browse files
Merge branch 'main' into dependabot-npm_and_yarn-types-node-20.8.9
2 parents 8df971b + f7bd793 commit b43feff

14 files changed

+26
-33
lines changed

.github/scripts/update-prs.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ const updatePrs = async ({ github, context }) => {
1010
per_page: 100
1111
});
1212

13-
const nonDraftPulls = pulls?.data?.filter((pr) => !pr.draft);
13+
const nonDraftAndDependabotPulls = pulls?.data?.filter((pr) => !pr.draft && pr.user.login !== "dependabot[bot]");
1414
let updatedBranches = 0;
1515

16-
if (nonDraftPulls?.length > 0) {
17-
for (const pr of nonDraftPulls) {
16+
if (nonDraftAndDependabotPulls?.length > 0) {
17+
for (const pr of nonDraftAndDependabotPulls) {
1818
try {
1919
await github.rest.pulls.updateBranch({
2020
owner,
@@ -28,7 +28,7 @@ const updatePrs = async ({ github, context }) => {
2828
}
2929
}
3030

31-
return `Updated branches: ${updatedBranches}/${nonDraftPulls.length}`;
31+
return `Updated branches: ${updatedBranches}/${nonDraftAndDependabotPulls.length}`;
3232
};
3333

3434
export default updatePrs;

.github/workflows/00-init-playground.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: styfle/[email protected]
1313

1414
- name: ⬇️ Checkout repo
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: 🔄 Init Cache Playground
1818
uses: ./.github/actions/npm-cache

.github/workflows/00-init.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: styfle/[email protected]
1313

1414
- name: ⬇️ Checkout repo
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: 🔄 Init Cache Default
1818
uses: ./.github/actions/npm-cache

.github/workflows/01-build-playground.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: ⬇️ Checkout repo
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: 🔄 Init Cache Playground
1515
uses: ./.github/actions/npm-cache

.github/workflows/01-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: ⬇️ Checkout repo
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: 🔄 Init Cache
1515
uses: ./.github/actions/npm-cache

.github/workflows/01-cypress.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
timeout-minutes: 10
1010
steps:
1111
- name: ⬇️ Checkout repo
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: 🔄 Init Cache
1515
uses: ./.github/actions/npm-cache
@@ -33,7 +33,7 @@ jobs:
3333
config: pageLoadTimeout=100000,baseUrl=http://localhost:8080
3434

3535
- name: 🛗 Upload Artifacts
36-
uses: actions/upload-artifact@v2
36+
uses: actions/upload-artifact@v3
3737
# after the test run completes
3838
# store videos and any screenshots
3939
# NOTE: screenshots will be generated only if an E2E test failed
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
name: cypress-screenshots
4444
path: e2e/cypress/screenshots
45-
- uses: actions/upload-artifact@v2
45+
- uses: actions/upload-artifact@v3
4646
# Test run video was always captured, so this action uses "always()" condition
4747
if: always()
4848
with:

.github/workflows/01-npm-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: ⬇️ Checkout repo
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: 🔄 Init Cache
1515
uses: ./.github/actions/npm-cache

.github/workflows/02-deploy-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
group: ${{ github.workflow }}-${{ github.ref }}
1212
steps:
1313
- name: ⬇️ Checkout repo
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: 🔄 Init Cache
1717
uses: ./.github/actions/npm-cache

.github/workflows/02-npm-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: ⬇️ Checkout repo
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: 🔄 Init Cache
1515
uses: ./.github/actions/npm-cache

.github/workflows/cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: ⬇️ Checkout repo
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: 🔄 Init Cache
1818
uses: ./.github/actions/npm-cache

0 commit comments

Comments
 (0)