From 0c4d9488f3c8064a67ed05d5f75ded2860bd8058 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 13:44:19 -0400 Subject: [PATCH 1/8] ci: fix syntax --- .github/workflows/release.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5124011..16bf0aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,13 +10,7 @@ jobs: publish: strategy: matrix: - ckan_instance: [ - { - name: New_Mexico_Water_Data_Catalog, - url: https://catalog.newmexicowaterdata.org, - token: ${{ secrets.NMWDC_API_BULK_LOADER_TOKEN }} - } - ] + ckan_instance: [{ name: New_Mexico_Water_Data_Catalog, url: https://catalog.newmexicowaterdata.org, token: ${{ secrets.NMWDC_API_BULK_LOADER_TOKEN }}} ] name: Publish JSONL file runs-on: ubuntu-latest steps: From c6de5d6690044effe90f3d4e2387e970b275d491 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:01:31 -0400 Subject: [PATCH 2/8] ci: use secret outside of matrix --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 16bf0aa..e732653 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: publish: strategy: matrix: - ckan_instance: [{ name: New_Mexico_Water_Data_Catalog, url: https://catalog.newmexicowaterdata.org, token: ${{ secrets.NMWDC_API_BULK_LOADER_TOKEN }}} ] + ckan_instance: [{ name: New_Mexico_Water_Data_Catalog, url: https://catalog.newmexicowaterdata.org, token: NMWDC_API_BULK_LOADER_TOKEN }] name: Publish JSONL file runs-on: ubuntu-latest steps: @@ -30,4 +30,4 @@ jobs: GITHUB_TOKEN: ${{ github.TOKEN }} NAMESPACE: ${{ matrix.namespace }} INSTANCE_URL: ${{ matrix.ckan_instance.url }} - API_TOKEN: ${{ matrix.ckan_instance.token }} + API_TOKEN: ${{ secrets[matrix.ckan_instance.token] }} From eb714aae813d05d896e70791712e016216988a11 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:13:44 -0400 Subject: [PATCH 3/8] fix: JSONL names --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e732653..60e8ae4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,8 +24,8 @@ jobs: - name: Run generate_release crate and upload JSONL file run: | cd ${{github.workspace}} - cargo run -p generate_release --release --verbose > ckan-geoconnex-web-resources-${{ matrix.namespace }}.jsonl - gh release upload ${{github.event.release.tag_name}} ckan-geoconnex-web-resources-${{ matrix.namespace }}.jsonl + cargo run -p generate_release --release --verbose > ${{ matrix.ckan_instance.name }}.jsonl + gh release upload ${{github.event.release.tag_name}} ${{ matrix.ckan_instance.name }}.jsonl env: GITHUB_TOKEN: ${{ github.TOKEN }} NAMESPACE: ${{ matrix.namespace }} From 4f4c576d978750cc27b1fe0187c8a5f9dc226a88 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:16:04 -0400 Subject: [PATCH 4/8] ci: set tag to namespace --- .github/workflows/container.yml | 2 +- bulk_loader/src/main.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 8401d2a..950f3bf 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -25,7 +25,7 @@ jobs: with: file: ./bulk_loader/Dockerfile push: true - tags: ghcr.io/dathere/ckan_geoconnex_bulk_runner:latest + tags: ghcr.io/dathere/ckan_geoconnex_bulk_runner:${{ matrix.namespace }} cache-from: type=gha,scope=ckan_geoconnex_bulk_runner platforms: linux/amd64 cache-to: type=gha,mode=max,scope=ckan_geoconnex_bulk_runner diff --git a/bulk_loader/src/main.rs b/bulk_loader/src/main.rs index 2073401..d36133f 100644 --- a/bulk_loader/src/main.rs +++ b/bulk_loader/src/main.rs @@ -6,7 +6,7 @@ async fn main() -> Result<()> { let namespace = std::env!("NAMESPACE"); // Get latest release data which is organized as a single JSONL file // at https://github.com/dathere/ckan_geoconnex_bulk_runner/releases/latest - let body = reqwest::get(format!("https://github.com/dathere/ckan_geoconnex_bulk_runner/releases/latest/download/ckan-geoconnex-web-resources-{namespace}.jsonl")) + let body = reqwest::get(format!("https://github.com/dathere/ckan_geoconnex_bulk_runner/releases/latest/download/{namespace}.jsonl")) .await? .text() .await?; From 1a8262042002257c7e13ac20ed56cb5526056bfb Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:20:23 -0400 Subject: [PATCH 5/8] ci: add build-args --- .github/workflows/container.yml | 4 ++-- bulk_loader/Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 950f3bf..b6cec52 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -29,5 +29,5 @@ jobs: cache-from: type=gha,scope=ckan_geoconnex_bulk_runner platforms: linux/amd64 cache-to: type=gha,mode=max,scope=ckan_geoconnex_bulk_runner - env: - NAMESPACE: ${{ matrix.namespace }} + build-args: + - NAMESPACE=${{ matrix.namespace }} diff --git a/bulk_loader/Dockerfile b/bulk_loader/Dockerfile index 87aa04f..4a3521a 100644 --- a/bulk_loader/Dockerfile +++ b/bulk_loader/Dockerfile @@ -2,6 +2,7 @@ FROM rust:1.96 AS builder WORKDIR /app RUN rustup set profile minimal COPY . . +ARG NAMESPACE RUN cargo build -p bulk_loader --release FROM ubuntu:latest From 566ea8cbc95dac03e47c2b1e7b770606613c1949 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:21:24 -0400 Subject: [PATCH 6/8] ci: fix build-args syntax --- .github/workflows/container.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index b6cec52..459686d 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -29,5 +29,5 @@ jobs: cache-from: type=gha,scope=ckan_geoconnex_bulk_runner platforms: linux/amd64 cache-to: type=gha,mode=max,scope=ckan_geoconnex_bulk_runner - build-args: - - NAMESPACE=${{ matrix.namespace }} + build-args: | + NAMESPACE=${{ matrix.namespace }} From 4067cdf382ab39ad30e17b9c8e934f0309bee7b7 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:24:32 -0400 Subject: [PATCH 7/8] build: include ENV from ARG --- bulk_loader/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/bulk_loader/Dockerfile b/bulk_loader/Dockerfile index 4a3521a..ebe410d 100644 --- a/bulk_loader/Dockerfile +++ b/bulk_loader/Dockerfile @@ -3,6 +3,7 @@ WORKDIR /app RUN rustup set profile minimal COPY . . ARG NAMESPACE +ENV NAMESPACE=$NAMESPACE RUN cargo build -p bulk_loader --release FROM ubuntu:latest From e009754ba71b64e364576794afd873d658801861 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:29:33 -0400 Subject: [PATCH 8/8] ci: fix namespace matrix value --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 60e8ae4..39b972d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,6 @@ jobs: gh release upload ${{github.event.release.tag_name}} ${{ matrix.ckan_instance.name }}.jsonl env: GITHUB_TOKEN: ${{ github.TOKEN }} - NAMESPACE: ${{ matrix.namespace }} + NAMESPACE: ${{ matrix.ckan_instance.name }} INSTANCE_URL: ${{ matrix.ckan_instance.url }} API_TOKEN: ${{ secrets[matrix.ckan_instance.token] }}