Compare commits

..

31 commits

Author SHA1 Message Date
XargonWan ac91fee758 Revert "Updated runtime to 6.8"
Some checks failed
Build Artifacts for RetroDECK main manifest / build-project (push) Has been cancelled
This reverts commit 9a114e4879.
2025-03-30 16:17:56 +09:00
XargonWan 9a114e4879 Updated runtime to 6.8 2025-03-30 09:36:06 +09:00
XargonWan 4d650135a7 Updating gitignore 2025-03-30 09:35:33 +09:00
XargonWan de7a817398 Update shared modules 2025-03-30 09:34:56 +09:00
XargonWan 0046281c72 Merge branch 'master' of https://github.com/flathub/net.rpcs3.RPCS3
Some checks failed
Build Artifacts for RetroDECK main manifest / build-project (push) Has been cancelled
2025-02-21 14:06:19 +09:00
Flatpak External Data Checker 4b9a6d470f rpcs3: Update rpcs3.git 2025-01-31 02:32:52 +00:00
Flatpak External Data Checker 16f0b6bd0d rpcs3: Update rpcs3.git 2025-01-24 19:02:46 +01:00
Julien Reichardt 437eb07388 Update rpcs3.git 2025-01-18 18:55:04 +01:00
Julien Reichardt 5bccde0d96 Fix check for updates action
Does not seem to work in a single expression.
2025-01-18 18:55:04 +01:00
XargonWan a226507ec8 Removing branch indication as ti causes issues
Some checks failed
Build Artifacts for RetroDECK main manifest / build-project (push) Has been cancelled
2025-01-15 09:55:50 +09:00
XargonWan 59f9242e0c Update from upstream script updated 2025-01-15 09:45:59 +09:00
XargonWan 0a2a94cc76 Update shared modules 2025-01-15 09:42:33 +09:00
XargonWan 12ac2fbeb5 Merge branch 'master' of https://github.com/flathub/net.rpcs3.RPCS3
Some checks failed
Build Artifacts for RetroDECK main manifest / build-project (push) Has been cancelled
2025-01-13 09:26:29 +09:00
Julien Reichardt 12e8d54241 Run check update action twice
Allow to merge the previously opened PR.
2025-01-11 20:16:48 +01:00
Flatpak External Data Checker f5ca018ff5 rpcs3: Update rpcs3.git 2025-01-11 18:45:04 +00:00
Flatpak External Data Checker 86e2ae9771 rpcs3: Update rpcs3.git 2025-01-05 19:21:45 +01:00
XargonWan 52b90a309a Merge branch 'master' of https://github.com/flathub/net.rpcs3.RPCS3
Some checks failed
Build Artifacts for RetroDECK main manifest / build-project (push) Has been cancelled
2025-01-04 21:46:42 +09:00
XargonWan dfb928b65f Temporary disabled auto updater until it will be fixed 2025-01-04 21:46:21 +09:00
Flatpak External Data Checker 1a24308130 rpcs3: Update rpcs3.git 2025-01-04 03:16:04 +01:00
Julien Reichardt c7775d9277 Update rpcs3.git 2025-01-02 13:27:50 +01:00
Julien Reichardt bd27b2a710 Add automerge-flathubbot-prs 2025-01-02 13:27:50 +01:00
Flatpak External Data Checker 3a6a0abcd8 rpcs3: Update rpcs3.git 2024-12-28 19:09:06 +01:00
Flatpak External Data Checker f5ea405ea3 rpcs3: Update rpcs3.git 2024-12-22 13:10:13 +01:00
Flatpak External Data Checker e74e16ec83 rpcs3: Update rpcs3.git 2024-12-21 22:31:10 +01:00
Flatpak External Data Checker 03af0823d8 rpcs3: Update rpcs3.git 2024-12-13 22:43:11 +01:00
Flatpak External Data Checker 3ad70bb283 rpcs3: Update rpcs3.git 2024-12-08 18:07:19 +01:00
Flatpak External Data Checker 83ba851ee3 rpcs3: Update rpcs3.git 2024-11-29 15:20:15 +01:00
Flatpak External Data Checker 294cfb197b rpcs3: Update rpcs3.git 2024-11-26 11:45:57 +01:00
Flatpak External Data Checker 25dd3415af rpcs3: Update rpcs3.git 2024-11-15 10:10:32 +01:00
XargonWan d5f17425b4 Trying to pass the secret as a secret
Some checks failed
Build Artifacts for RetroDECK main manifest / build-project (push) Has been cancelled
2024-11-08 10:12:19 +09:00
XargonWan aafa34912d Trying to pass the secret as an input 2024-11-08 10:08:40 +09:00
6 changed files with 41 additions and 6 deletions

View file

@ -3,9 +3,11 @@ 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:
uses: RetroDECK/components-template/.github/workflows/pr_from_upstream.yml@main
secrets:
REKKU_PRIVATE_KEY: ${{ secrets.REKKU_PRIVATE_KEY }}

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/.flatpak-builder/
/.build/
/repo/
./.vscode

View file

@ -1,4 +1,5 @@
{
"automerge-flathubbot-prs": true,
"disable-external-data-checker": true,
"only-arches": ["x86_64"]
}

View file

@ -97,5 +97,4 @@ modules:
sources:
- type: git
url: https://github.com/RPCS3/rpcs3.git
branch: master
#commit: 5eb4691cd68817b3cdfb91d35902aba7daf315f2
commit: 665bb8329786e39aca0fd082870ae83996c06c56

@ -1 +1 @@
Subproject commit d47140b52c6ef4a9ae61fe0fda3b31c3e36f2291
Subproject commit 627dcefe587e693ff99269361f1d0cdf10aac340

32
update_from_upstream.sh Executable file
View file

@ -0,0 +1,32 @@
#!/bin/bash
target_branch="master"
update_submodules="true"
# Get the repository name
repo_url=$(git remote get-url origin)
repo_name=$(basename -s .git "$repo_url")
echo "Fetching https://github.com/flathub/$repo_name $target_branch"
if [ "$update_submodules" = "true" ]; then
echo "And updating submodules also"
fi
echo ""
# Fetch the latest changes from the remote master branch
git fetch https://github.com/flathub/"$repo_name" "$target_branch"
# Merge the fetched changes into your current branch
git merge FETCH_HEAD
if [ "$update_submodules" = "true" ]; then
# Update submodules to the versions specified in the repo
git submodule update --init --recursive
# Update submodules to the versions specified in the fetched repo
git submodule update --remote
git add shared-modules
git commit -m "Update shared modules"
fi