File tree 1 file changed +11
-12
lines changed
1 file changed +11
-12
lines changed Original file line number Diff line number Diff line change 8
8
# Allows you to run this workflow manually from the Actions tab
9
9
workflow_dispatch :
10
10
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
16
16
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
21
21
22
22
jobs :
23
23
update-main :
@@ -29,11 +29,10 @@ jobs:
29
29
run : |
30
30
git config user.name 'github-actions'
31
31
git config user.email '[email protected] '
32
- - name : Merge source into update- main
32
+ - name : Merge source into main
33
33
run : |
34
- git checkout update- main
34
+ git checkout main
35
35
git merge source --no-ff --commit -m "Update main from source"
36
- git push
37
36
- name : Push to main
38
37
run : git push origin main
39
38
env :
You can’t perform that action at this time.
0 commit comments