Skip to content

Commit 0254f50

Browse files
committed
add merge from master to gh-pages
1 parent 4c1c56e commit 0254f50

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@ jobs:
1717
- name: Use Node.js
1818
uses: actions/setup-node@v1
1919
with:
20-
node-version: '14' # Adjust as per your project's requirement
20+
node-version: '18'
2121

2222
- name: Install Dependencies
2323
run: npm install
2424

2525
- name: Build
2626
run: npm run build
2727

28+
- name: Merge from master
29+
run: git checkout gh-pages
30+
run: git merge master
31+
2832
- name: Deploy to GitHub Pages
2933
uses: peaceiris/actions-gh-pages@v3
3034
with:

0 commit comments

Comments
 (0)