From 8cca90b3a584e71aa6d5cc456e3576515c577ccf Mon Sep 17 00:00:00 2001 From: Georgia Stuart Date: Sun, 2 Apr 2023 05:37:13 -0500 Subject: [PATCH 1/5] Update to programatically change baseurl Signed-off-by: Georgia Stuart --- .github/workflows/docs.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 31b9d9cb01f19..2b35690db7d00 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,7 +18,7 @@ jobs: ref: "gh-pages" - name: Create conda environment - run: conda create --quiet -c conda-forge --name shpc spython + run: conda create --quiet -c conda-forge --name shpc spython requests - name: Install shpc run: | @@ -27,6 +27,17 @@ jobs: pip install git+https://github.com/singularityhub/singularity-hpc@main git clone https://github.com/singularityhub/shpc-registry /tmp/registry + - name: Set Pages base URL and Registry URL + run: | + URL=$(curl -L \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ github.token }}"\ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/${{ github.repository }}/pages \ + | jq -r '.html_url') + sed -i "s|/shpc-registry|$URL|" _config.yml + sed -i "s|singularityhub/shpc-registry|${{ github.repository }}|'" generate.sh + - name: Generate docs run: | export PATH="/usr/share/miniconda/bin:$PATH" From f8276346f67820fd51a259f3f0b2e6ead08adad1 Mon Sep 17 00:00:00 2001 From: Georgia Stuart Date: Sun, 2 Apr 2023 05:40:01 -0500 Subject: [PATCH 2/5] Trigger workflow Signed-off-by: Georgia Stuart --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000000000..e69de29bb2d1d From 5df260368cec9e0e0c58b3d73996301af297dbc1 Mon Sep 17 00:00:00 2001 From: Georgia Stuart Date: Sun, 2 Apr 2023 05:44:36 -0500 Subject: [PATCH 3/5] Debug print Signed-off-by: Georgia Stuart --- .github/workflows/docs.yml | 1 + test | 0 2 files changed, 1 insertion(+) delete mode 100644 test diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2b35690db7d00..68cbebdec457c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -35,6 +35,7 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/${{ github.repository }}/pages \ | jq -r '.html_url') + echo $URL sed -i "s|/shpc-registry|$URL|" _config.yml sed -i "s|singularityhub/shpc-registry|${{ github.repository }}|'" generate.sh diff --git a/test b/test deleted file mode 100644 index e69de29bb2d1d..0000000000000 From 6866bebb04d3c6f2bd38ef80f040ab9fc2d3de8f Mon Sep 17 00:00:00 2001 From: Georgia Stuart Date: Sun, 2 Apr 2023 05:47:23 -0500 Subject: [PATCH 4/5] Remove extra quote Signed-off-by: Georgia Stuart --- .github/workflows/docs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 68cbebdec457c..f69ca06056ab3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -35,9 +35,8 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/${{ github.repository }}/pages \ | jq -r '.html_url') - echo $URL sed -i "s|/shpc-registry|$URL|" _config.yml - sed -i "s|singularityhub/shpc-registry|${{ github.repository }}|'" generate.sh + sed -i "s|singularityhub/shpc-registry|${{ github.repository }}|" generate.sh - name: Generate docs run: | From d8c1ac9141386200442e1b0f82ae6084e4940b49 Mon Sep 17 00:00:00 2001 From: Georgia Stuart Date: Sun, 2 Apr 2023 06:02:46 -0500 Subject: [PATCH 5/5] Automatically update URL Signed-off-by: Georgia Stuart --- .github/workflows/docs.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f69ca06056ab3..84e13e81b8dd4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,14 +18,19 @@ jobs: ref: "gh-pages" - name: Create conda environment - run: conda create --quiet -c conda-forge --name shpc spython requests + run: conda create --quiet -c conda-forge --name shpc spython + + - name: Check out main + uses: "actions/checkout@v3" + with: + ref: "main" + path: "tmp-registry" - name: Install shpc run: | export PATH="/usr/share/miniconda/bin:$PATH" source activate shpc pip install git+https://github.com/singularityhub/singularity-hpc@main - git clone https://github.com/singularityhub/shpc-registry /tmp/registry - name: Set Pages base URL and Registry URL run: | @@ -42,7 +47,8 @@ jobs: run: | export PATH="/usr/share/miniconda/bin:$PATH" source activate shpc - /bin/bash generate.sh /tmp/registry + /bin/bash generate.sh ./tmp-registry + rm -r tmp-registry - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@4.1.1