Skip to content

Commit

Permalink
upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
zen0bit committed Nov 1, 2024
1 parent 2f454ee commit d06ca53
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 0 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# .github/workflows/sync.yml
name: Rebase Upstream
on:
schedule:
- cron: '0 */6 * * *' # Run every 6 hours
workflow_dispatch: # run manually

jobs:
sync:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
with:
fetch-depth: 9999 # greater than the number of commits you made
- uses: imba-tjd/rebase-upstream-action@master
with:
upstream: void-linux/void-packages
branch: master
58 changes: 58 additions & 0 deletions .github/workflows/update_master.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
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 }}

0 comments on commit d06ca53

Please sign in to comment.