diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml new file mode 100644 index 00000000..a73a6126 --- /dev/null +++ b/.github/workflows/sync-upstream.yml @@ -0,0 +1,38 @@ +name: Sync Upstream + +on: + schedule: + - cron: "0 * * * *" # Her saat başı çalışır + workflow_dispatch: # İstersen elle de çalıştırabilirsin + +permissions: + contents: write + +jobs: + sync: + runs-on: ubuntu-latest + + steps: + - name: Checkout fork + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + + - name: Add upstream + run: git remote add upstream https://github.com/MCCTeam/Minecraft-Console-Client.git + + - name: Fetch upstream + run: git fetch upstream + + - name: Merge upstream (upstream wins conflicts) + run: | + git checkout master + git merge upstream/master -X theirs --no-edit + + - name: Push changes + run: git push origin master