From 7204b0fdc86391fb0efdd03710e97728f2eab3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 29 Mar 2025 20:09:14 +0000 Subject: [PATCH 1/3] Fix generation of historical spec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the move of the config file, the command in CI did not work as expected anymore. I am unsure why Hugo actually ignored the missing config file in the command… To avoid this problem in the future and simplify the job, we use the default config and add an environment variable for the status which will always take precedence over the config. Signed-off-by: Kévin Commaille --- .github/workflows/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 25a2fb68..2149e2a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -265,7 +265,7 @@ jobs: name: "📖 Build the historical backup spec" runs-on: ubuntu-latest needs: [build-openapi] - if: ${{ startsWith(github.ref, 'refs/tags/') }} + # if: ${{ startsWith(github.ref, 'refs/tags/') }} steps: - name: "➕ Setup Node" uses: actions/setup-node@v4 @@ -283,10 +283,11 @@ jobs: npm i npm run get-proposals - name: "⚙️ hugo" + env: + HUGO_PARAMS_VERSION_STATUS: "historical" # Create a baseURL like `/v1.2` out of the `v1.2` tag run: | - echo -e '[params.version]\nstatus="historical"' > historical.toml - hugo --config config.toml,historical.toml --baseURL "/${GITHUB_REF/refs\/tags\//}" -d "spec" + hugo --baseURL "/${GITHUB_REF/refs\/tags\//}" -d "spec" - name: "📥 Spec definition download" uses: actions/download-artifact@v4 From c4f89011d3f991c0ca574ed1fa6ded04b346dffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 29 Mar 2025 20:22:44 +0000 Subject: [PATCH 2/3] Add changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/internal/newsfragments/2123.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/internal/newsfragments/2123.clarification diff --git a/changelogs/internal/newsfragments/2123.clarification b/changelogs/internal/newsfragments/2123.clarification new file mode 100644 index 00000000..af26abaf --- /dev/null +++ b/changelogs/internal/newsfragments/2123.clarification @@ -0,0 +1 @@ +Fix the historical info box when generating the historical spec in CI. From a862fd17867f46d6157e4d84a787d0b44809eac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 29 Mar 2025 20:25:52 +0000 Subject: [PATCH 3/3] Re-enable historical job condition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2149e2a1..bd12f1cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -265,7 +265,7 @@ jobs: name: "📖 Build the historical backup spec" runs-on: ubuntu-latest needs: [build-openapi] - # if: ${{ startsWith(github.ref, 'refs/tags/') }} + if: ${{ startsWith(github.ref, 'refs/tags/') }} steps: - name: "➕ Setup Node" uses: actions/setup-node@v4