From cb17c6d4e4a314469daaed00d88d68e9064b8323 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Mon, 10 Nov 2025 15:40:29 -0600 Subject: [PATCH] fix branch --- .gitea/workflows/lint-test-docker.yaml | 6 +++--- .gitea/workflows/lint-test-helm.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/lint-test-docker.yaml b/.gitea/workflows/lint-test-docker.yaml index 92f9af9a5..e4a93c861 100644 --- a/.gitea/workflows/lint-test-docker.yaml +++ b/.gitea/workflows/lint-test-docker.yaml @@ -28,11 +28,11 @@ jobs: id: check-branch-exists uses: GuillaumeFalourd/branch-exists@v1.1 with: - branch: "origin/${{ github.base_ref }}" + branch: "${{ github.base_ref }}" - name: Branch Does Not Exist if: steps.check-branch-exists.outputs.exists == 'false' - run: echo "Branch origin/${{ github.base_ref }} was not found, likely already merged" + run: echo "Branch ${{ github.base_ref }} was not found, likely already merged" - name: Set up Node.js if: steps.check-branch-exists.outputs.exists == 'true' @@ -45,7 +45,7 @@ jobs: run: | set -e # Exit immediately if a command exits with a non-zero status. - TARGET_BRANCH="origin/${{ github.base_ref }}" + TARGET_BRANCH="${{ github.base_ref }}" echo ">> Target branch for diff is: $TARGET_BRANCH" CHANGED_FILES=$(git diff --name-only "$TARGET_BRANCH" -- 'hosts/**') diff --git a/.gitea/workflows/lint-test-helm.yaml b/.gitea/workflows/lint-test-helm.yaml index 9b0ee3821..ae6407b5c 100644 --- a/.gitea/workflows/lint-test-helm.yaml +++ b/.gitea/workflows/lint-test-helm.yaml @@ -28,11 +28,11 @@ jobs: id: check-branch-exists uses: GuillaumeFalourd/branch-exists@v1.1 with: - branch: "origin/${{ github.base_ref }}" + branch: ${{ github.base_ref }} - name: Branch Does Not Exist if: steps.check-branch-exists.outputs.exists == 'false' - run: echo "Branch origin/${{ github.base_ref }} was not found, likely already merged" + run: echo "Branch ${{ github.base_ref }} was not found, likely already merged" - name: Set up Helm if: steps.check-branch-exists.outputs.exists == 'true' @@ -46,7 +46,7 @@ jobs: run: | set -e # Exit immediately if a command exits with a non-zero status. - TARGET_BRANCH="origin/${{ github.base_ref }}" + TARGET_BRANCH="${{ github.base_ref }}" echo ">> Target branch for diff is: $TARGET_BRANCH" CHANGED_FILES=$(git diff --name-only "$TARGET_BRANCH" -- 'clusters/**')