From dfb928b65feff98a59b49243ecd32fb5b323d934 Mon Sep 17 00:00:00 2001 From: XargonWan <XargonWan@gmail.com> Date: Sat, 4 Jan 2025 21:46:21 +0900 Subject: [PATCH] Temporary disabled auto updater until it will be fixed --- .github/workflows/pr-from-upstream.yml | 4 ++-- update_from_upstream.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100755 update_from_upstream.sh diff --git a/.github/workflows/pr-from-upstream.yml b/.github/workflows/pr-from-upstream.yml index 1a40935..463c537 100644 --- a/.github/workflows/pr-from-upstream.yml +++ b/.github/workflows/pr-from-upstream.yml @@ -3,8 +3,8 @@ name: "Sync with Upstream and Create PR" on: workflow_call: workflow_dispatch: - schedule: - - cron: "30 0 * * *" # Run every day at 00:30 UTC (9:30 JST) + # schedule: + # - cron: "30 0 * * *" # Run every day at 00:30 UTC (9:30 JST) jobs: upstream-sync: diff --git a/update_from_upstream.sh b/update_from_upstream.sh new file mode 100755 index 0000000..5b6a7fe --- /dev/null +++ b/update_from_upstream.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +git fetch https://github.com/flathub/net.rpcs3.RPCS3 master # Fetch the latest changes from the remote master branch +git merge FETCH_HEAD # Merge the fetched changes into your current branch \ No newline at end of file