From 3c7710c0db0967f96ec3b9a4c2984cbaa4084f67 Mon Sep 17 00:00:00 2001 From: Morgan Funtowicz Date: Fri, 10 Jan 2025 15:19:31 +0100 Subject: [PATCH] misc(ci): use commit HEAD instead of merge commit for image id --- .github/workflows/build_trtllm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_trtllm.yaml b/.github/workflows/build_trtllm.yaml index f6badc3b..7e992024 100644 --- a/.github/workflows/build_trtllm.yaml +++ b/.github/workflows/build_trtllm.yaml @@ -30,6 +30,8 @@ jobs: group: ${{ inputs.runs-on }} steps: - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4.4.1 @@ -82,7 +84,7 @@ jobs: images: | registry.internal.huggingface.tech/api-inference/community/text-generation-inference/tensorrt-llm tags: | - type=raw,value=sha-${{ env.GITHUB_SHA_SHORT }}${{ env.LABEL }} + type=raw,value=sha-${{ env.GITHUB_SHA_SHORT }}-${{ env.LABEL }} # If main, release or tag - name: Extract metadata (tags, labels) for Docker @@ -99,7 +101,7 @@ jobs: type=semver,pattern={{version}}${{ env.LABEL }} type=semver,pattern={{major}}.{{minor}}${{ env.LABEL }} type=raw,value=latest${{ env.LABEL }},enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} - type=raw,value=sha-${{ env.GITHUB_SHA_SHORT }}${{ env.LABEL }} + type=raw,value=sha-${{ env.GITHUB_SHA_SHORT }}-${{ env.LABEL }} - name: Build and push Docker image id: build-and-push