Commit 7f09c44 1 parent 6219b57 commit 7f09c44 Copy full SHA for 7f09c44
File tree 1 file changed +13
-5
lines changed
1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change 1
1
name : Sync main-apache branch with upstream/main
2
2
3
3
env :
4
- USERNAME : github-actions[bot]
5
- USEREMAIL : github-actions[bot]@users.noreply.github .com
4
+ USERNAME : kie-ci
5
+ USEREMAIL : kie-ci0@redhat .com
6
6
UPSTREAM_REMOTE : https://github.com/apache/incubator-kie-kogito-serverless-operator.git
7
+ GITHUB_TOKEN : ${{ secrets.APACHE_SYNC_MIDSTREAM_TOKEN }}
7
8
8
9
on :
9
10
schedule :
17
18
18
19
steps :
19
20
- name : Checkout repository
20
- uses : actions/checkout@v3
21
+ uses : actions/checkout@v4
22
+ with :
23
+ token : ${{ secrets.APACHE_SYNC_MIDSTREAM_TOKEN }}
21
24
22
25
- name : Setup git environment
23
26
run : |
@@ -26,14 +29,19 @@ jobs:
26
29
git remote add upstream $UPSTREAM_REMOTE
27
30
28
31
- name : Fetch all
29
- run : git fetch --all
32
+ run : git fetch --all --tags
30
33
31
34
- name : Checkout main-apache branch
32
35
run : git checkout --track origin/main-apache
33
36
37
+ - name : Pull main-apache branch
38
+ run : git pull
39
+
34
40
- name : Merge upstream/main branch
35
41
run : git merge --no-edit upstream/main
36
42
37
43
- name : Push changes
38
- run : git push origin main-apache
44
+ run : git push
39
45
46
+ - name : Push last tag
47
+ run : git push origin $(git tag --sort=creatordate | tail -n 1)
You can’t perform that action at this time.
0 commit comments