Skip to content

Commit 8032f3b

Browse files
committed
chore: fix randomly broken github action workflow files
1 parent ff09871 commit 8032f3b

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- 'website.js'
1111
- 'CHANGELOG.md'
1212
push:
13-
branches:ubuntu
13+
branches:
1414
- master
1515
paths:
1616
- '.github/workflows/documentation.yml'

.github/workflows/test.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ jobs:
8787
- name: Setup node
8888
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
8989
with:
90-
<<<<<<< HEAD
9190
node-version: 22
92-
=======
93-
node-version: 20
94-
>>>>>>> 7.x
9591
- name: Load MongoDB binary cache
9692
id: cache-mongodb-binaries
9793
uses: actions/cache@v4
@@ -119,11 +115,7 @@ jobs:
119115
- name: Setup node
120116
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
121117
with:
122-
<<<<<<< HEAD
123118
node-version: 22
124-
=======
125-
node-version: 20
126-
>>>>>>> 7.x
127119
- run: npm install
128120
- name: Test
129121
run: npm run test-rs

0 commit comments

Comments
 (0)