From 265a9fd4de0d26ca04923d7abc3867b5b52de371 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Mon, 23 Sep 2024 14:53:28 +0200
Subject: [PATCH] upstream

---
 .github/workflows/sync.yml          | 18 +++++++++
 .github/workflows/update_master.yml | 58 +++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 .github/workflows/sync.yml
 create mode 100644 .github/workflows/update_master.yml

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
new file mode 100644
index 00000000000000..d95b4896d6a128
--- /dev/null
+++ b/.github/workflows/sync.yml
@@ -0,0 +1,18 @@
+# .github/workflows/sync.yml
+name: Rebase Upstream
+on:
+  schedule:
+  - cron: "0 0 * * 0"  # run once a week
+  workflow_dispatch:   # run manually
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+      with:
+        fetch-depth: 333 # greater than the number of commits you made
+    - uses: imba-tjd/rebase-upstream-action@master
+      with:
+        upstream: void-linux/void-packages
+        branch: master
diff --git a/.github/workflows/update_master.yml b/.github/workflows/update_master.yml
new file mode 100644
index 00000000000000..dd9cb428d973ac
--- /dev/null
+++ b/.github/workflows/update_master.yml
@@ -0,0 +1,58 @@
+name: 'Sync master branch with upstream'
+
+on:
+  schedule:
+    - cron:  '0 7 * * *'
+    # scheduled at 07:00 every Monday and Thursday
+
+  workflow_dispatch:  # click the button on Github repo!
+    inputs:
+      sync_test_mode: # Adds a boolean option that appears during manual workflow run for easy test mode config
+        description: 'Fork Sync Test Mode'
+        type: boolean
+        default: false
+
+jobs:
+  sync_latest_from_upstream:
+    runs-on: ubuntu-latest
+    name: Sync latest commits from upstream repo
+
+    steps:
+    # REQUIRED step
+    # Step 1: run a standard checkout action, provided by github
+    - name: Checkout target repo
+      uses: actions/checkout@v3
+      with:
+        # optional: set the branch to checkout,
+        # sync action checks out your 'target_sync_branch' anyway
+        ref:  master
+        # REQUIRED if your upstream repo is private (see wiki)
+        persist-credentials: false
+
+    # REQUIRED step
+    # Step 2: run the sync action
+    - name: Sync upstream changes
+      id: sync
+      uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.1
+      with:
+        target_sync_branch: master
+        # REQUIRED 'target_repo_token' exactly like this!
+        target_repo_token: ${{ secrets.GITHUB_TOKEN }}
+        upstream_sync_branch: master
+        upstream_sync_repo: void-linux/void-packages
+        #upstream_repo_access_token: ${{ secrets.UPSTREAM_REPO_SECRET }}
+
+        # Set test_mode true during manual dispatch to run tests instead of the true action!!
+        test_mode: ${{ inputs.sync_test_mode }}
+
+    # Step 3: Display a sample message based on the sync output var 'has_new_commits'
+    - name: New commits found
+      if: steps.sync.outputs.has_new_commits == 'true'
+      run: echo "New commits were found to sync."
+
+    - name: No new commits
+      if: steps.sync.outputs.has_new_commits == 'false'
+      run: echo "There were no new commits."
+
+    - name: Show value of 'has_new_commits'
+      run: echo ${{ steps.sync.outputs.has_new_commits }}