Skip to content

Commit 291ea35

Browse files
bitnerbitner
committed
fix ci
1 parent d0ca895 commit 291ea35

File tree

1 file changed

+19
-33
lines changed

1 file changed

+19
-33
lines changed

‎.github/workflows/civ2.yml‎

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,9 @@ on:
88

99
env:
1010
REGISTRY: ghcr.io
11-
REGISTRYPATH: ghcr.io/stac-utils/
12-
PGSTACIMAGE: ghcr.io/stac-utils/pgstac-postgres
13-
PGSTACLATEST: ghcr.io/stac-utils/pgstac-postgres:latest
14-
IMAGE_NAME: ${{ github.repository }}
11+
REGISTRYPATH: ghcr.io/stac-utils
1512
DOCKER_BUILDKIT: 1
16-
PIP_BREAK_SYSTEM_PACKAGES: 1
17-
PGPASSWORD: postgres
18-
PGHOST: postgres
19-
PGDATABASE: postgres
20-
PGUSER: postgres
21-
POSTGRES_PASSWORD: postgres
22-
SCRIPTS: /home/runner/work/pgstac/pgstac/docker/pypgstac/bin
23-
PGSTACDIR: /home/runner/work/pgstac/pgstac/src/pgstac
24-
PYPGSTACDIR: /home/runner/work/pgstac/pgstac/src/pypgstac
25-
MIGRATIONSDIR: /home/runner/work/pgstac/pgstac/src/pgstac/migrations
26-
TESTS: /home/runner/work/pgstac/pgstac/src/pypgstac/tests
13+
2714

2815

2916
jobs:
@@ -77,7 +64,7 @@ jobs:
7764
context: .
7865
target: pgstacbase
7966
file: docker/pgstac/Dockerfile
80-
tags: ghcr.io/stac-utils/pgstac-base:${{ needs.check-pgstac-base.outputs.pgstac-image-hash }}
67+
tags: ${{ env.REGISTRYPATH }}/pgstac-base:${{ needs.check-pgstac-base.outputs.pgstac-image-hash }}
8168
push: true
8269
cache-from: type=gha
8370
cache-to: type=gha, mode=max
@@ -132,7 +119,7 @@ jobs:
132119
context: .
133120
target: pypgstac-base
134121
file: docker/pypgstac/Dockerfile
135-
tags: ghcr.io/stac-utils/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
122+
tags: ${{ env.REGISTRYPATH }}/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
136123
push: true
137124
cache-from: type=gha
138125
cache-to: type=gha, mode=max
@@ -145,28 +132,28 @@ jobs:
145132
with:
146133
working-directory: src/pypgstac
147134
target: x86_64
148-
args: --release --out /home/runner/work/pgstac/pgstac/dist
135+
args: --release --out ${{ env.GITHUB_WORKSPACE }}/dist
149136
sccache: 'true'
150137
manylinux: auto
151138
- name: Upload wheels
152139
uses: actions/upload-artifact@v4
153140
with:
154141
name: wheels
155-
path: /home/runner/work/pgstac/pgstac/dist/*
142+
path: ${{ env.GITHUB_WORKSPACE }}/dist/*
156143
if-no-files-found: error
157144
test:
158145
needs: [check-pgstac-base, check-pypgstac-base, buildpg, buildpypgstacbase, wheels]
159146
if: ${{ always() && !failure() && !cancelled() }}
160147
runs-on: ubuntu-latest
161-
container: ghcr.io/stac-utils/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
148+
container: ${{ env.REGISTRYPATH }}/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
162149
env:
163150
PGHOST: localhost
164151
PGUSER: postgres
165152
PGPASSWORD: postgres
166153
PGDATABASE: postgres
167154
services:
168155
pg:
169-
image: ghcr.io/stac-utils/pgstac-base:${{ needs.check-pgstac-base.outputs.pgstac-image-hash }}
156+
image: ${{ env.REGISTRYPATH }}/pgstac-base:${{ needs.check-pgstac-base.outputs.pgstac-image-hash }}
170157
env:
171158
POSTGRES_PASSWORD: postgres
172159
POSTGRES_USER: postgres
@@ -186,16 +173,15 @@ jobs:
186173
path: /tmp/wheels
187174
- name: Check paths
188175
run: |
189-
ls /home/runner/work/
190-
ls /home/runner/work/pgstac/pgstac
176+
ls ${{ env.GITHUB_WORKSPACE }}
191177
- name: Install pypgstac
192178
run: |
193-
cd /home/runner/work/pgstac/pgstac/src/pypgstac
179+
cd ${{ env.GITHUB_WORKSPACE }}/src/pypgstac
194180
source $UV_PROJECT_ENVIRONMENT/bin/activate
195181
uv pip install --offline --find-links /tmp/wheels pypgstac
196182
- name: Run tests
197183
run: |
198-
cd /home/runner/work/pgstac/pgstac/src/pypgstac
184+
cd ${{ env.GITHUB_WORKSPACE }}/src/pypgstac
199185
source $UV_PROJECT_ENVIRONMENT/bin/activate
200186
$SCRIPTS/test
201187
@@ -208,14 +194,14 @@ jobs:
208194
# with:
209195
# working-directory: src/pypgstac
210196
# target: x86_64
211-
# args: --release --out /home/runner/work/pgstac/pgstac/dist
197+
# args: --release --out ${{ env.GITHUB_WORKSPACE }}/dist
212198
# sccache: 'true'
213199
# manylinux: auto
214200
# - name: Upload wheels
215201
# uses: actions/upload-artifact@v4
216202
# with:
217203
# name: wheels-x86_64
218-
# path: /home/runner/work/pgstac/pgstac/dist/*
204+
# path: ${{ env.GITHUB_WORKSPACE }}/dist/*
219205
# if-no-files-found: error
220206

221207
# linux:
@@ -231,14 +217,14 @@ jobs:
231217
# with:
232218
# working-directory: src/pypgstac
233219
# target: ${{ matrix.target }}
234-
# args: --release --out /home/runner/work/pgstac/pgstac/dist
220+
# args: --release --out ${{ env.GITHUB_WORKSPACE }}/dist
235221
# sccache: 'true'
236222
# manylinux: auto
237223
# - name: Upload wheels
238224
# uses: actions/upload-artifact@v4
239225
# with:
240226
# name: wheels-${{ matrix.target }}
241-
# path: /home/runner/work/pgstac/pgstac/dist/*
227+
# path: ${{ env.GITHUB_WORKSPACE }}/dist/*
242228
# if-no-files-found: error
243229

244230
# windows:
@@ -259,13 +245,13 @@ jobs:
259245
# with:
260246
# working-directory: src/pypgstac
261247
# target: ${{ matrix.target }}
262-
# args: --release --out /home/runner/work/pgstac/pgstac/dist
248+
# args: --release --out ${{ env.GITHUB_WORKSPACE }}/dist
263249
# sccache: 'true'
264250
# - name: Upload wheels
265251
# uses: actions/upload-artifact@v4
266252
# with:
267253
# name: win-wheels-${{ matrix.target }}
268-
# path: /home/runner/work/pgstac/pgstac/dist/*
254+
# path: ${{ env.GITHUB_WORKSPACE }}/dist/*
269255
# if-no-files-found: error
270256

271257
# macos:
@@ -300,12 +286,12 @@ jobs:
300286
# with:
301287
# working-directory: src/pypgstac
302288
# command: sdist
303-
# args: --out /home/runner/work/pgstac/pgstac/dist
289+
# args: --out ${{ env.GITHUB_WORKSPACE }}/dist
304290
# - name: Upload sdist
305291
# uses: actions/upload-artifact@v4
306292
# with:
307293
# name: source-wheels
308-
# path: /home/runner/work/pgstac/pgstac/dist/*
294+
# path: ${{ env.GITHUB_WORKSPACE }}/dist/*
309295
# if-no-files-found: error
310296

311297
#

0 commit comments

Comments
 (0)