From 739f89d68b4145f8fb95419c70bc65047f6191df Mon Sep 17 00:00:00 2001 From: Julien Reichardt Date: Sun, 5 Mar 2023 14:59:56 +0100 Subject: [PATCH 1/2] Finally fix git safe directory error --- .github/workflows/update.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index e00895d..081e1e8 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -11,9 +11,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Mark repository as safe - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest env: GIT_AUTHOR_NAME: Flatpak External Data Checker @@ -24,4 +21,5 @@ jobs: EMAIL: 41898282+github-actions[bot]@users.noreply.github.com GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - args: --update --never-fork net.rpcs3.RPCS3.yaml + entrypoint: /bin/sh + args: -c "git config --global --add safe.directory /github/workspace && cd /github/workspace && /app/flatpak-external-data-checker --update --never-fork net.rpcs3.RPCS3.yaml" From 11b987891dbebedbb1ac33891f8b405c54c0b825 Mon Sep 17 00:00:00 2001 From: Julien Reichardt Date: Sun, 5 Mar 2023 15:17:08 +0100 Subject: [PATCH 2/2] Update rpcs3.git --- net.rpcs3.RPCS3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index a534f24..e748912 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -95,7 +95,7 @@ modules: - type: git url: https://github.com/RPCS3/rpcs3.git branch: master - commit: 2de4c03faa54f001910c1cc5bafda62cc23fa803 + commit: 0d34b97948ac98ca5bfad5cecfde61cf9c8c3291 - type: git url: https://github.com/intel/ittapi.git branch: master