Skip to content

Commit 1dff93e

Browse files
authored
ci: refactor (#906)
Trying to fix some strange linking errors when running the validate stac-geoparquet script.
1 parent 5446566 commit 1dff93e

File tree

3 files changed

+16
-42
lines changed

3 files changed

+16
-42
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ concurrency:
1313
env:
1414
CARGO_TERM_COLOR: always
1515
CARGO_TERM_VERBOSE: true
16-
duckdb-version: "1.4.2"
16+
RUSTDOCFLAGS: -Dwarnings
17+
DUCKDB_VERSION: "1.4.2"
18+
DUCKDB_LIB_DIR: /opt/duckdb
19+
LD_LIBRARY_PATH: /opt/duckdb
1720

1821
jobs:
1922
test-core:
@@ -47,21 +50,27 @@ jobs:
4750
test:
4851
name: Test
4952
runs-on: ubuntu-latest
50-
env:
51-
DUCKDB_LIB_DIR: /opt/duckdb
52-
LD_LIBRARY_PATH: /opt/duckdb
5353
steps:
5454
- uses: actions/checkout@v6
5555
- uses: Swatinem/rust-cache@v2
5656
- uses: astral-sh/setup-uv@v7
57-
- name: Get DuckDB
57+
- &get-duckdb
58+
name: Get DuckDB
5859
run: |
59-
wget https://github.com/duckdb/duckdb/releases/download/v${{ env.duckdb-version }}/libduckdb-linux-amd64.zip
60+
wget https://github.com/duckdb/duckdb/releases/download/v${{ env.DUCKDB_VERSION }}/libduckdb-linux-amd64.zip
6061
unzip libduckdb-linux-amd64.zip -d /opt/duckdb
6162
rm libduckdb-linux-amd64.zip
6263
- uses: j178/prek-action@v1
6364
- name: Test
6465
run: cargo test
66+
validate:
67+
name: Validate
68+
runs-on: ubuntu-latest
69+
steps:
70+
- uses: actions/checkout@v6
71+
- uses: Swatinem/rust-cache@v2
72+
- uses: astral-sh/setup-uv@v7
73+
- *get-duckdb
6574
- name: Validate stac-server
6675
run: uv run --group stac-api-validator scripts/validate-stac-server
6776
- name: Validate stac-geoparquet
@@ -74,9 +83,6 @@ jobs:
7483
pgstac_version:
7584
- v0.8.6
7685
- v0.9.8
77-
env:
78-
DUCKDB_LIB_DIR: /opt/duckdb
79-
LD_LIBRARY_PATH: /opt/duckdb
8086
services:
8187
pgstac:
8288
image: ghcr.io/stac-utils/pgstac:${{ matrix.pgstac_version }}
@@ -93,10 +99,7 @@ jobs:
9399
- uses: actions/checkout@v6
94100
- uses: Swatinem/rust-cache@v2
95101
- uses: astral-sh/setup-uv@v7
96-
- name: Get DuckDB
97-
run: |
98-
wget https://github.com/duckdb/duckdb/releases/download/v${{ env.duckdb-version }}/libduckdb-linux-amd64.zip
99-
unzip libduckdb-linux-amd64.zip -d /opt/duckdb
102+
- *get-duckdb
100103
- name: Test
101104
run: cargo test -p pgstac --all-features
102105
- name: Validate
@@ -120,8 +123,6 @@ jobs:
120123
doc:
121124
name: Docs
122125
runs-on: ubuntu-latest
123-
env:
124-
RUSTDOCFLAGS: -Dwarnings
125126
steps:
126127
- uses: actions/checkout@v6
127128
- uses: Swatinem/rust-cache@v2

.github/workflows/labels.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

scripts/validate-stac-geoparquet

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ try:
5959
[
6060
"cargo",
6161
"run",
62-
"-p",
63-
"rustac",
6462
"--",
6563
"translate",
6664
path,
@@ -88,8 +86,6 @@ try:
8886
[
8987
"cargo",
9088
"run",
91-
"-p",
92-
"rustac",
9389
"--",
9490
"translate",
9591
parquet_path,

0 commit comments

Comments
 (0)