Skip to content
This repository has been archived by the owner on Jun 15, 2023. It is now read-only.

Commit

Permalink
Sync fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Wakeful-Cloud committed Aug 3, 2021
1 parent ef02c6a commit dd6a794
Showing 1 changed file with 40 additions and 43 deletions.
83 changes: 40 additions & 43 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,40 @@
# Synchronize this repository with its upstream source (ultimaker/curaengine)

name: Synchronize

on:
# Run every Saturday at 00:00 UTC
schedule:
- cron: '0 0 * * 6'

# Run when manually triggered
workflow_dispatch:

jobs:
synchronize:
name: Synchronize with upstream
runs-on: ubuntu-latest
steps:
# Checkout downstream (This repository)
- name: Checkout downstream
uses: actions/checkout@v2
with:
fetch-depth: 0

# Authenticate to Git
- name: Authenticate to Git
uses: OleksiyRudenko/gha-git-credentials@v2
with:
token: ${{ github.token }}

# Merge upstream
- name: Merge upstream
run: |
git config merge.ours.driver true
git config pull.rebase false
git remote add upstream https://github.com/ultimaker/curaengine.git
git pull upstream master
git merge upstream/master
# Stage and commit changes
- name: Add and commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Synchronized with upstream
# Synchronize this repository with its upstream source (ultimaker/curaengine)

name: Synchronize

on:
# Run every Saturday at 00:00 UTC
schedule:
- cron: '0 0 * * 6'

# Run when manually triggered
workflow_dispatch:

jobs:
synchronize:
name: Synchronize with upstream
runs-on: ubuntu-latest
steps:
# Checkout downstream (This repository)
- name: Checkout downstream
uses: actions/checkout@v2
with:
fetch-depth: 0

# Authenticate to Git
- name: Authenticate to Git
uses: OleksiyRudenko/gha-git-credentials@v2
with:
token: ${{ github.token }}

# Merge upstream
- name: Merge upstream
run: |
git config merge.ours.driver true
git config pull.rebase false
git remote add upstream https://github.com/ultimaker/curaengine.git
git pull upstream master
# Push changes
- name: Push changes
run: git push origin main

0 comments on commit dd6a794

Please sign in to comment.