Compare commits

..

12 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
4 changed files with 33 additions and 5 deletions

1
.gitignore vendored
View file

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

View file

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

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

View file

@ -1,4 +1,32 @@
#!/bin/bash #!/bin/bash
git fetch https://github.com/flathub/net.rpcs3.RPCS3 master # Fetch the latest changes from the remote master branch target_branch="master"
git merge FETCH_HEAD # Merge the fetched changes into your current branch 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