Skip to content

Commit

Permalink
Sync with upstream
Browse files Browse the repository at this point in the history
Signed-off-by: popcorny <[email protected]>
  • Loading branch information
popcornylu committed May 27, 2024
1 parent 455ba70 commit a75cd4f
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/recce-prsync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,17 @@ jobs:
steps:
- name: Checkout the repo
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Add Upstream remote
run: git remote add upstream https://github.com/opensource-observer/oso.git

- name: Fetch Upstream
run: git fetch

- name: Rebase from Upstream
run: |
git checkout dev
git rebase upstream/main
- name: Push changes
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git checkout dev
git remote add upstream https://github.com/opensource-observer/oso.git
git fetch upstream
git rebase upstream/main
git push origin dev
prsync:
runs-on: ubuntu-latest
Expand Down

0 comments on commit a75cd4f

Please sign in to comment.