From 85a048ecad7c6f06bfda613175bce325b0675846 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Mon, 21 Oct 2024 16:17:08 -0700 Subject: [PATCH 1/3] Update GitHub Actions workflow to support main branch and Python 3.12 --- .github/workflows/validate-catalog.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/validate-catalog.yaml b/.github/workflows/validate-catalog.yaml index 9f45554..bbd9856 100644 --- a/.github/workflows/validate-catalog.yaml +++ b/.github/workflows/validate-catalog.yaml @@ -3,8 +3,11 @@ name: catalog on: pull_request: branches: + - main push: branches: + - main + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -20,11 +23,16 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: "3.10" - - name: validate feedstock entry + python-version: "3.12" + - name: validate feedstock entry and generate catalog uses: leap-stc/data-catalog-actions/leap-catalog@main with: - single-feedstock: "./feedstock/catalog.yaml" + generation-single: "./feedstock/catalog.yaml" + output-directory: "./catalog" + + - name: Commit changes + run: | + cat catalog/output/consolidated-web-catalog.json | jq # - name: Dispatch event # uses: actions/github-script@v4 From 5f039b182bbad5b2117a61acca717f8f38854222 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Mon, 21 Oct 2024 16:20:18 -0700 Subject: [PATCH 2/3] Fix output directory path in validate-catalog workflow --- .github/workflows/validate-catalog.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-catalog.yaml b/.github/workflows/validate-catalog.yaml index bbd9856..3e43fd4 100644 --- a/.github/workflows/validate-catalog.yaml +++ b/.github/workflows/validate-catalog.yaml @@ -28,11 +28,11 @@ jobs: uses: leap-stc/data-catalog-actions/leap-catalog@main with: generation-single: "./feedstock/catalog.yaml" - output-directory: "./catalog" + output-directory: "./" - name: Commit changes run: | - cat catalog/output/consolidated-web-catalog.json | jq + cat output/consolidated-web-catalog.json | jq # - name: Dispatch event # uses: actions/github-script@v4 From 6191afacfbf6e4b3c3f078641ad76401b610cc30 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Mon, 21 Oct 2024 16:26:15 -0700 Subject: [PATCH 3/3] Rename job step from "Commit changes" to "display catalog" in validate-catalog workflow --- .github/workflows/validate-catalog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-catalog.yaml b/.github/workflows/validate-catalog.yaml index 3e43fd4..85cbbb0 100644 --- a/.github/workflows/validate-catalog.yaml +++ b/.github/workflows/validate-catalog.yaml @@ -30,7 +30,7 @@ jobs: generation-single: "./feedstock/catalog.yaml" output-directory: "./" - - name: Commit changes + - name: display catalog run: | cat output/consolidated-web-catalog.json | jq