diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index a4fb5daa0..3b57b5c1d 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -21,18 +21,6 @@ on: merge_group: jobs: - sync: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.event.workflow_run.head_sha }} - - name: Extract branch name - run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - id: extract_branch - - name: Print branch name - run: echo "${{ steps.extract_branch.outputs.branch }}" docker-build: if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }} strategy: diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 188b0bd2a..ac91e5e59 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -28,11 +28,11 @@ jobs: docker-build: runs-on: ubuntu-latest steps: - - - name: Checkout - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: - ref: ${{ github.event.workflow_run.head_sha }} + ref: ${{ github.event.workflow_run.head_branch }} + - run: git branch + - run: env - name: Docker Login if: ${{ inputs.push == true && github.ref_name == 'main' }}