mirror of
https://github.com/RetroDECK/net.rpcs3.RPCS3.git
synced 2025-04-10 19:15:12 +00:00
Compare commits
No commits in common. "master" and "master-11685050828" have entirely different histories.
master
...
master-116
6
.github/workflows/pr-from-upstream.yml
vendored
6
.github/workflows/pr-from-upstream.yml
vendored
|
@ -3,11 +3,9 @@ name: "Sync with Upstream and Create PR"
|
||||||
on:
|
on:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
# schedule:
|
schedule:
|
||||||
# - cron: "30 0 * * *" # Run every day at 00:30 UTC (9:30 JST)
|
- cron: "30 0 * * *" # Run every day at 00:30 UTC (9:30 JST)
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
upstream-sync:
|
upstream-sync:
|
||||||
uses: RetroDECK/components-template/.github/workflows/pr_from_upstream.yml@main
|
uses: RetroDECK/components-template/.github/workflows/pr_from_upstream.yml@main
|
||||||
secrets:
|
|
||||||
REKKU_PRIVATE_KEY: ${{ secrets.REKKU_PRIVATE_KEY }}
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,4 +1,3 @@
|
||||||
/.flatpak-builder/
|
/.flatpak-builder/
|
||||||
/.build/
|
/.build/
|
||||||
/repo/
|
/repo/
|
||||||
./.vscode
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{
|
{
|
||||||
"automerge-flathubbot-prs": true,
|
|
||||||
"disable-external-data-checker": true,
|
"disable-external-data-checker": true,
|
||||||
"only-arches": ["x86_64"]
|
"only-arches": ["x86_64"]
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,4 +97,5 @@ modules:
|
||||||
sources:
|
sources:
|
||||||
- type: git
|
- type: git
|
||||||
url: https://github.com/RPCS3/rpcs3.git
|
url: https://github.com/RPCS3/rpcs3.git
|
||||||
commit: 665bb8329786e39aca0fd082870ae83996c06c56
|
branch: master
|
||||||
|
#commit: 5eb4691cd68817b3cdfb91d35902aba7daf315f2
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 627dcefe587e693ff99269361f1d0cdf10aac340
|
Subproject commit d47140b52c6ef4a9ae61fe0fda3b31c3e36f2291
|
|
@ -1,32 +0,0 @@
|
||||||
#!/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
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue