Skip to content

Commit fa7ad43

Browse files
committed
fix ci
1 parent 9422c8c commit fa7ad43

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

.github/workflows/civ2.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
set -e
4545
IMAGE=stac-utils/pgstac-base
4646
HASH=$(git log -1 --pretty="format:%h" -- docker/pgstac)
47-
TAG="\"sha-$HASH\""
47+
TAG="\"$HASH\""
4848
TOKEN=$(curl -s https://ghcr.io/token\?scope\="repository:$IMAGE:pull" | jq -r .token)
4949
EXISTS=$(curl -s -H "Authorization: Bearer $TOKEN" https://ghcr.io/v2/$IMAGE/tags/list | jq "try(any(.tags[]; . == $TAG))")
5050
echo "pgstac-image-exists=$EXISTS" >>$GITHUB_OUTPUT
@@ -57,14 +57,6 @@ jobs:
5757
runs-on: ubuntu-latest
5858
steps:
5959
- uses: actions/checkout@v4
60-
- name: Docker Meta
61-
id: meta
62-
uses: docker/metadata-action@v5
63-
with:
64-
images: |
65-
ghcr.io/stac-utils/pgstac-base
66-
tags: |
67-
type=sha
6860
- uses: docker/setup-buildx-action@v3
6961
- name: Log in to the Container registry
7062
uses: docker/login-action@v3
@@ -79,7 +71,7 @@ jobs:
7971
context: .
8072
target: pgstacbase
8173
file: docker/pgstac/Dockerfile
82-
tags: ${{ steps.meta.outputs.tags }}
74+
tags: ${{ needs.check-pgstac-base.outputs.pgstac-image-hash }}
8375
push: true
8476
cache-from: type=gha
8577
cache-to: type=gha, mode=max

0 commit comments

Comments
 (0)