diff --git a/.gitea/workflows/dev-branch.yaml b/.gitea/workflows/dev-branch.yaml index 3bd023b1..8a5c0476 100644 --- a/.gitea/workflows/dev-branch.yaml +++ b/.gitea/workflows/dev-branch.yaml @@ -19,9 +19,9 @@ jobs: runs-on: ubuntu-latest steps: - - name: Install node, curl and zip + - name: Install node, xvfb, curl and zip run: | - apt update && apt -y install curl zip nodejs + apt update && apt -y install curl zip nodejs xvfb # - name: Checkout with LFS # uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main @@ -34,6 +34,16 @@ jobs: lfs: false persist-credentials: true + - name: Create LFS file list + run: /usr/bin/git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id + + - name: Restore LFS cache + uses: actions/cache@v5 + id: lfs-cache + with: + path: .git/lfs + key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }} + - name: Checkout LFS run: | git lfs install --local @@ -42,31 +52,6 @@ jobs: git config -f $AUTH_FILE --unset http.${{ gitea.server_url }}/.extraheader git config -f $AUTH_FILE http.${{ gitea.server_url }}/${{ gitea.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH" git lfs pull - -# - name: Create LFS file list -# run: /usr/bin/git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id -# -# - name: Restore LFS cache -# uses: actions/cache@v5 -# id: lfs-cache -# with: -# path: .git/lfs -# key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }} -# -# - name: Checkout LFS -# run: | -# UrlBase=$GITHUB_SERVER_URL; \ -# UrlLfsBase=$UrlBase/${{ gitea.repository }}.git/info/lfs/objects; \ -# Auth=`/usr/bin/git config --get --local http.$UrlBase/.extraheader`; \ -# /usr/bin/git config --local http.${UrlLfsBase}/batch.extraheader "$Auth"; \ -# /usr/bin/git config --local http.${UrlLfsBase}/.extraheader '' -# -# git config --local lfs.transfer.maxretries 1 -# -# /usr/bin/git lfs fetch origin refs/remotes/origin/${{ gitea.ref_name }} -# /usr/bin/git lfs checkout -# /usr/bin/git add . -# /usr/bin/git reset --hard # Cache - name: Restore Assets