From ee0b700dec1b5dc74e45a90f2cebabbb24add2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Tue, 21 Nov 2023 22:36:21 +0100 Subject: [PATCH 1/4] changed fixed date to attribute docprodtime in cf-conventions.adoc --- cf-conventions.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-conventions.adoc b/cf-conventions.adoc index f8a8b527..8b7878dd 100644 --- a/cf-conventions.adoc +++ b/cf-conventions.adoc @@ -1,7 +1,7 @@ include::version.adoc[] = NetCDF Climate and Forecast (CF) Metadata Conventions Brian{nbsp}Eaton; Jonathan{nbsp}Gregory; Bob{nbsp}Drach; Karl{nbsp}Taylor; Steve{nbsp}Hankin; Jon{nbsp}Blower; John{nbsp}Caron; Rich{nbsp}Signell; Phil{nbsp}Bentley; Greg{nbsp}Rappa; Heinke{nbsp}Höck; Alison{nbsp}Pamment; Martin{nbsp}Juckes; Martin{nbsp}Raspaud; Randy{nbsp}Horne; Timothy{nbsp}Whiteaker; David{nbsp}Blodgett; Charlie{nbsp}Zender; Daniel{nbsp}Lee; David{nbsp}Hassell; Alan{nbsp}D.{nbsp}Snow; Tobias{nbsp}Kölling; Dave{nbsp}Allured; Aleksandar{nbsp}Jelenak; Anders{nbsp}Meier{nbsp}Soerensen; Lucile{nbsp}Gaultier; Sylvain{nbsp}Herlédan; Fernando{nbsp}Manzano; Lars{nbsp}Bärring; Christopher{nbsp}Barker -Version {current-version}, 31 August, 2022: See https://cfconventions.org for further information +Version{nbsp}{current-version},{nbsp}{nbsp}{docprodtime}: See https://cfconventions.org for further information :doctype: book :pdf-folio-placement: physical :sectanchors: From 649987ca13a110e5b2db7b0ed291e8d37d8d5fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Tue, 21 Nov 2023 22:37:39 +0100 Subject: [PATCH 2/4] updated workflow processing --- .github/workflows/adoc_build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/adoc_build.yml b/.github/workflows/adoc_build.yml index 6c12c33a..5843ec19 100644 --- a/.github/workflows/adoc_build.yml +++ b/.github/workflows/adoc_build.yml @@ -44,20 +44,24 @@ jobs: - uses: actions/checkout@v2 # Create build directory - run: mkdir conventions_build - - name: Set "final" tag + - name: Set draft date-time formatting + if: github.event_name != 'release' + run: | + echo "DATE_FMT='+%d %B, %Y %H:%M:%SZ'" >> "$GITHUB_ENV" + - name: Set "final" tag and date-time formatting if: github.event_name == 'release' run: | - echo "FINAL_TAG=-a final" >> "$GITHUB_ENV" + echo "FINAL_TAG=-a final" >> "$GITHUB_ENV"; echo "DATE_FMT='+%d %B, %Y'" >> "$GITHUB_ENV" # Build cf-conventions.html using the Analog-inc asciidoctor-action - name: Build cf-conventions.html uses: Analog-inc/asciidoctor-action@v1.2 with: - shellcommand: 'asciidoctor --verbose ${FINAL_TAG} cf-conventions.adoc -D conventions_build; cp -r images conventions_build' + shellcommand: 'asciidoctor --verbose ${FINAL_TAG} -a docprodtime=$(date -u ${DATE_FMT}) cf-conventions.adoc -D conventions_build; cp -r images conventions_build' # Build cf-conventions.pdf using the Analog-inc asciidoctor-action - name: Build cf-conventions.pdf uses: Analog-inc/asciidoctor-action@v1.2 with: - shellcommand: 'asciidoctor-pdf --verbose ${FINAL_TAG} -d book -a pdf-theme=default-theme-CF-version.yml --trace cf-conventions.adoc -D conventions_build' + shellcommand: 'asciidoctor-pdf --verbose ${FINAL_TAG} -a docprodtime=$(date -u ${DATE_FMT}) -d book -a pdf-theme=default-theme-CF-version.yml --trace cf-conventions.adoc -D conventions_build' # Upload artifact containing cf-conventions.html, cf-conventions.pdf - name: Upload cf-conventions doc preview uses: actions/upload-artifact@v2 From 5a4862c227d5b58750f496252b6389b7e7c318db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Tue, 21 Nov 2023 22:39:39 +0100 Subject: [PATCH 3/4] updated history --- history.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/history.adoc b/history.adoc index 964d27aa..ff3ddcfc 100644 --- a/history.adoc +++ b/history.adoc @@ -7,6 +7,7 @@ === Working version (most recent first) +* {issues}457[Issue #457]: Creation date of the draft Conventions document * {issues}147[Issue #147]: Clarify the use of compressed dimensions in related variables * {issues}483[Issue #483]: Add a missing author * {issues}463[Issue #463]: Convert URLs with HTTP protocol to HTTPS if available, fixed a few dead links From 07e94a24dc18ae043796c26c76d400624a26f0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Wed, 22 Nov 2023 10:16:02 +0100 Subject: [PATCH 4/4] fixing the workflow: removed apostrophes when assigning DATE_FMT --- .github/workflows/adoc_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/adoc_build.yml b/.github/workflows/adoc_build.yml index 5843ec19..323e3f45 100644 --- a/.github/workflows/adoc_build.yml +++ b/.github/workflows/adoc_build.yml @@ -47,11 +47,11 @@ jobs: - name: Set draft date-time formatting if: github.event_name != 'release' run: | - echo "DATE_FMT='+%d %B, %Y %H:%M:%SZ'" >> "$GITHUB_ENV" + echo "DATE_FMT=+%d %B, %Y %H:%M:%SZ" >> "$GITHUB_ENV" - name: Set "final" tag and date-time formatting if: github.event_name == 'release' run: | - echo "FINAL_TAG=-a final" >> "$GITHUB_ENV"; echo "DATE_FMT='+%d %B, %Y'" >> "$GITHUB_ENV" + echo "FINAL_TAG=-a final" >> "$GITHUB_ENV"; echo "DATE_FMT=+%d %B, %Y" >> "$GITHUB_ENV" # Build cf-conventions.html using the Analog-inc asciidoctor-action - name: Build cf-conventions.html uses: Analog-inc/asciidoctor-action@v1.2