Skip to content

Commit d58ccd7

Browse files
committed
fix ci
1 parent 417af63 commit d58ccd7

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

.github/workflows/civ2.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,15 @@ jobs:
145145
needs: [check-pgstac-base, check-pypgstac-base, buildpg, buildpypgstacbase, wheels]
146146
if: ${{ always() && !failure() && !cancelled() }}
147147
runs-on: ubuntu-latest
148-
container: ghcr.io/stac-utils/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
149-
env:
150-
PGHOST: localhost
151-
PGUSER: postgres
152-
PGPASSWORD: postgres
153-
PGDATABASE: postgres
148+
container:
149+
image: ghcr.io/stac-utils/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
150+
env:
151+
PGHOST: localhost
152+
PGUSER: postgres
153+
PGPASSWORD: postgres
154+
PGDATABASE: postgres
155+
volumes:
156+
- $GITHUB_WORKSPACE:/opt/src/
154157
services:
155158
pg:
156159
image: ghcr.io/stac-utils/pgstac-base:${{ needs.check-pgstac-base.outputs.pgstac-image-hash }}
@@ -171,24 +174,17 @@ jobs:
171174
with:
172175
name: wheels
173176
path: /tmp/wheels
174-
- name: Check paths
175-
run: |
176-
ls $GITHUB_WORKSPACE
177177
- name: Install pypgstac
178178
run: |
179179
cd $GITHUB_WORKSPACE/src/pypgstac
180180
pwd
181181
ls
182-
source $UV_PROJECT_ENVIRONMENT/bin/activate
182+
source /venv/bin/activate
183183
uv pip install --offline --find-links /tmp/wheels pypgstac
184184
- name: Run tests
185185
run: |
186-
cd $GITHUB_WORKSPACE
187-
pwd
188-
ls
189-
echo $UV_PROJECT_ENVIRONMENT
190-
source $UV_PROJECT_ENVIRONMENT/bin/activate
191-
./scripts/test
186+
source /venv/bin/activate
187+
/scripts/test
192188
193189
# linux_x86_64:
194190
# runs-on: ubuntu-latest

docker/pypgstac/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ RUN \
5151
&& apt-get clean && apt-get -y autoremove \
5252
&& uv sync --frozen --no-install-project --extra test --extra dev --extra migrations --extra psycopg \
5353
&& uv pip install setuptools
54+
COPY ./docker/pypgstac/bin /scripts
5455

5556

5657
# slim image for running pypgstac

0 commit comments

Comments
 (0)