andata
/
rancher-partner-charts
mirror of https://git.rancher.io/partner-charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #824 from nflondo/fix/update-action 

Adding merge strategy
pull/825/head
alex-isv 2023-07-11 15:01:19 -06:00 committed by GitHub
parent 9868b59392 804007ce87
commit 142e5b4c69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/daily.yaml vendored
View File

@ -52,9 +52,9 @@ jobs:
run: | run: |
git config --global user.name "github-actions[bot]" git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global pull.rebase false # merge (this is the default)
scripts/pull-ci-scripts scripts/pull-ci-scripts
bin/partner-charts-ci auto bin/partner-charts-ci auto
git pull origin main-source
git push origin main-source git push origin main-source
- name: Update main branch - name: Update main branch
run: | run: |