From ff593cc4216c31cff5b22df47cafc5fb87116699 Mon Sep 17 00:00:00 2001 From: Jeffrey Vervoort Date: Thu, 18 Apr 2024 12:23:38 +0200 Subject: [PATCH] Fix label on main branch for docker images (YAML scalar cannot contain comments). --- .github/workflows/registry_upload.yml | 8 ++++---- .pre-commit-config.yaml | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/registry_upload.yml b/.github/workflows/registry_upload.yml index 4a452706..c4ef236a 100644 --- a/.github/workflows/registry_upload.yml +++ b/.github/workflows/registry_upload.yml @@ -66,11 +66,11 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.IMAGE_NAME }} + # Set tag to latest if there is no release tag from git + # Tag the build with the current release tags: | - #Set tag to latest if there is no release tag from git - type=raw,value=latest,enable={{is_default_branch && !tag}} - #Tag the build with the current release - type=tag,event=tag,enable={{is_default_branch}} + type=raw,value=latest,enable={{is_default_branch && !tag}} + type=tag,event=tag,enable={{is_default_branch}} - name: Copy Protobuf files to Dockerfile directories run: ./ci/docker/copy-protobuf.sh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a85ffc36..471ebd6a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,6 @@ repos: # only checks syntax not load the yaml: # https://stackoverflow.com/questions/59413979/how-exclude-ref-tag-from-check-yaml-git-hook args: ["--unsafe"] # Parse the yaml files for syntax. - exclude: ".github\/workflows\/*" # TODO: Re-enable when the issue https://github.com/psf/black/issues/4175 is solved for Black. ## reorder-python-imports ~ sort python imports