Skip to content

Commit 93da59d

Browse files
committed
Fix workflow
1 parent 2ad9268 commit 93da59d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.github/workflows/static.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ on:
88
# Allows you to run this workflow manually from the Actions tab
99
workflow_dispatch:
1010

11-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
12-
permissions:
13-
contents: read
14-
pages: write
15-
id-token: write
11+
# # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
12+
# permissions:
13+
# contents: read
14+
# pages: write
15+
# id-token: write
1616

17-
# Allow one concurrent deployment
18-
concurrency:
19-
group: "pages"
20-
cancel-in-progress: true
17+
# # Allow one concurrent deployment
18+
# concurrency:
19+
# group: "pages"
20+
# cancel-in-progress: true
2121

2222
jobs:
2323
update-main:
@@ -29,9 +29,9 @@ jobs:
2929
run: |
3030
git config user.name 'github-actions'
3131
git config user.email '[email protected]'
32-
- name: Merge source into update-main
32+
- name: Merge source into main
3333
run: |
34-
git checkout update-main
34+
git checkout main
3535
git merge source --no-ff --commit -m "Update main from source"
3636
git push
3737
- name: Push to main

0 commit comments

Comments
 (0)