From 64c757d03e0d54227cb14a5183470c113c739b7b Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 25 Jan 2025 18:29:50 +1100 Subject: [PATCH 1/2] fix: dont fetch master on deploy - deploy runs on master branch, dont attempt to fetch it --- .gitea/workflows/deploy.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index ec56b72..eceb5ad 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -18,10 +18,6 @@ jobs: with: fetch-depth: 0 - - name: Fetch master branch - run: | - git fetch origin master:master - - name: Run Packer Builds env: VAULT_ROLEID: ${{ secrets.PACKER_BUILDER_VAULT_ROLEID }} -- 2.47.3 From 28e0a5b0ee57531dce3cd3d538073d47d83c8a86 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 25 Jan 2025 18:31:40 +1100 Subject: [PATCH 2/2] fix: remove git fetch from build.sh --- ci/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index 1fbcba1..19b7fe3 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,7 +1,6 @@ #!/bin/bash # Check for changes in images/ folder and the builds/ folder -git fetch origin master:master if [ "$(git branch --show-current)" = "master" ]; then builds_changes=$(git diff --name-only HEAD^...master | grep -E '^builds/') images_changes=$(git diff --name-only HEAD^...master | grep -E '^images/') -- 2.47.3