diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 459686d..8401d2a 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -25,9 +25,9 @@ jobs: with: file: ./bulk_loader/Dockerfile push: true - tags: ghcr.io/dathere/ckan_geoconnex_bulk_runner:${{ matrix.namespace }} + tags: ghcr.io/dathere/ckan_geoconnex_bulk_runner:latest 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 }} + env: + NAMESPACE: ${{ matrix.namespace }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 39b972d..5124011 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,13 @@ jobs: publish: strategy: matrix: - ckan_instance: [{ name: New_Mexico_Water_Data_Catalog, url: https://catalog.newmexicowaterdata.org, token: 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: @@ -24,10 +30,10 @@ jobs: - name: Run generate_release crate and upload JSONL file run: | cd ${{github.workspace}} - 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 + 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 env: GITHUB_TOKEN: ${{ github.TOKEN }} - NAMESPACE: ${{ matrix.ckan_instance.name }} + NAMESPACE: ${{ matrix.namespace }} INSTANCE_URL: ${{ matrix.ckan_instance.url }} - API_TOKEN: ${{ secrets[matrix.ckan_instance.token] }} + API_TOKEN: ${{ matrix.ckan_instance.token }} diff --git a/bulk_loader/Dockerfile b/bulk_loader/Dockerfile index ebe410d..87aa04f 100644 --- a/bulk_loader/Dockerfile +++ b/bulk_loader/Dockerfile @@ -2,8 +2,6 @@ FROM rust:1.96 AS builder WORKDIR /app RUN rustup set profile minimal COPY . . -ARG NAMESPACE -ENV NAMESPACE=$NAMESPACE RUN cargo build -p bulk_loader --release FROM ubuntu:latest diff --git a/bulk_loader/src/main.rs b/bulk_loader/src/main.rs index d36133f..2073401 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/{namespace}.jsonl")) + let body = reqwest::get(format!("https://github.com/dathere/ckan_geoconnex_bulk_runner/releases/latest/download/ckan-geoconnex-web-resources-{namespace}.jsonl")) .await? .text() .await?;