Skip to content

Commit 15f31cc

Browse files
authored
Merge pull request #2576 from cjihrig/rm-0.x
remove support for v0.x release line
2 parents 1c70ad7 + 0150c38 commit 15f31cc

File tree

3 files changed

+26
-32
lines changed

3 files changed

+26
-32
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ updates:
66
interval: 'daily'
77
time: '02:00'
88
target-branch: 'main'
9-
- package-ecosystem: 'npm'
10-
directory: '/'
11-
target-branch: 'master'
12-
schedule:
13-
interval: 'daily'
14-
time: '01:00'
159
- package-ecosystem: 'github-actions'
1610
directory: '/'
1711
schedule:

.github/workflows/deploy-docs.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
name: Build and Deploy Docs
22
on:
3-
push:
4-
branches:
5-
- master
3+
push:
4+
branches:
5+
- main
66
jobs:
7-
build-and-deploy-docs:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- name: Checkout
11-
uses: actions/[email protected]
12-
- name: Setup Node.js
13-
uses: actions/setup-node@v4
14-
with:
15-
node-version: '20'
16-
# Pre-check to validate that versions match between package.json
17-
# and package-lock.json. Needs to run before npm install
18-
- name: Validate package.json and package-lock.json versions
19-
run: node version-check.js
20-
- name: Install dependencies
21-
run: npm ci
22-
- name: Build docs
23-
run: npm run docs
7+
build-and-deploy-docs:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/[email protected]
12+
- name: Setup Node.js
13+
uses: actions/setup-node@v4
14+
with:
15+
node-version: '20'
16+
# Pre-check to validate that versions match between package.json
17+
# and package-lock.json. Needs to run before npm install
18+
- name: Validate package.json and package-lock.json versions
19+
run: node version-check.js
20+
- name: Install dependencies
21+
run: npm ci
22+
- name: Build docs
23+
run: npm run docs
2424

25-
- name: Deploy docs
26-
uses: JamesIves/[email protected]
27-
with:
28-
branch: gh-pages # The branch the action should deploy to.
29-
folder: docs # The folder the action should deploy.
25+
- name: Deploy docs
26+
uses: JamesIves/[email protected]
27+
with:
28+
branch: gh-pages # The branch the action should deploy to.
29+
folder: docs # The folder the action should deploy.

pre-check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [[ "${branch}" != "main" ]]; then
88
fi
99

1010
if ! git diff --quiet; then
11-
echo "This script must only run on a clean master branch."
11+
echo "This script must only run on a clean main branch."
1212
echo
1313
git status
1414
exit 1

0 commit comments

Comments
 (0)