From aeea64ac347b2ccc2597d83b3adae1671ff927b2 Mon Sep 17 00:00:00 2001 From: skyline Date: Wed, 24 Dec 2025 03:46:39 +0000 Subject: [PATCH] Update .github/workflows/fetch-upstream-mods.yml --- .github/workflows/fetch-upstream-mods.yml | 38 ++++++++++++++--------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/fetch-upstream-mods.yml b/.github/workflows/fetch-upstream-mods.yml index 728face6..51701a4d 100644 --- a/.github/workflows/fetch-upstream-mods.yml +++ b/.github/workflows/fetch-upstream-mods.yml @@ -10,10 +10,30 @@ jobs: runs-on: ubuntu-latest steps: - - name: Clone Gitea repo + - name: Clone Gitea repo (skip LFS smudge) run: | rm -rf repo /tmp/upstream - git clone ssh://git@smallgit.dasguney.com:2222/skyline/balatro-mod-index.git repo + GIT_LFS_SKIP_SMUDGE=1 \ + git clone ssh://git@smallgit.dasguney.com:2222/skyline/balatro-mod-index.git repo + + - name: Configure LFS and fetch objects + env: + GITEA_TOKEN: ${{ secrets.GT_TOKEN }} + run: | + cd repo + + # Auth for Git + LFS + printf "machine smallgit.dasguney.com\nlogin skyline\npassword %s\n" "$GITEA_TOKEN" > ~/.netrc + chmod 600 ~/.netrc + + # Force LFS to use direct Gitea endpoint (no nginx) + git config lfs.url "http://smallgit.dasguney.com:3000/skyline/balatro-mod-index.git/info/lfs" + git config lfs."http://smallgit.dasguney.com:3000/skyline/balatro-mod-index.git/info/lfs".locksverify false + + # Install hooks and explicitly fetch LFS data + git lfs install --local + git lfs fetch origin + git lfs checkout - name: Clone upstream GitHub repo run: | @@ -34,27 +54,15 @@ jobs: done - name: Commit and push - env: - GITEA_TOKEN: ${{ secrets.GT_TOKEN }} run: | cd repo git config user.name "jim[bot]" git config user.email "jim[bot]@users.noreply.github.com" - # Write .netrc safely (no heredoc) - printf "machine smallgit.dasguney.com\nlogin skyline\npassword %s\n" "$GITEA_TOKEN" > ~/.netrc - chmod 600 ~/.netrc - - # Use direct Gitea HTTP endpoint + # Use direct Gitea HTTP endpoint for push git remote set-url origin http://smallgit.dasguney.com:3000/skyline/balatro-mod-index.git - # Make git-lfs use the same endpoint and disable lock verification - git config lfs.url "http://smallgit.dasguney.com:3000/skyline/balatro-mod-index.git/info/lfs" - git config lfs."http://smallgit.dasguney.com:3000/skyline/balatro-mod-index.git/info/lfs".locksverify false - - git lfs install --local || true - git add mods if git commit -m "fetch upstream mod changes ($(date --utc +%Y%m%d_%H%M%SZ))"; then git push origin main