From 5742face4c51a19840a324e1a29d1a45e7d42aac Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 22:47:57 +0100 Subject: [PATCH 01/10] Fix version_plugin_docs_to_md.yml --- .github/workflows/version_plugin_docs_to_md.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 39a1857b..4d6b24ed 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -24,6 +24,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: repository: elastic/docs + ref: master path: docs persist-credentials: false - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 From 9437ddf79cb43be2d863e9d5973db740d7eeda86 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:02:04 +0100 Subject: [PATCH 02/10] Comment out migration and upload steps --- .../workflows/version_plugin_docs_to_md.yml | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 4d6b24ed..0ba0b70e 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -45,13 +45,22 @@ jobs: working-directory: ./adoc-to-md/src/docker run: ./create_image.sh - - name: Migrate - working-directory: ./asciidocalypse/migration-zone/logstash-versioned-plugins/scripts - run: ./migrate.sh + # - name: Migrate + # working-directory: ./asciidocalypse/migration-zone/logstash-versioned-plugins/scripts + # run: ./migrate.sh - - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 - with: - name: migrated-docs - if-no-files-found: error - retention-days: 1 - path: asciidocalypse/migration-zone/logstash-versioned-plugins + - run: | + docker run -dit --rm --name adoc-to-md \ + -v ./logstash-docs:/doc/logstash-docs \ + -v out:/out \ + -e HISTFILE=/scripts/.bash_history \ + adoc-builder + + - run: ls out + + # - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 + # with: + # name: migrated-docs + # if-no-files-found: error + # retention-days: 1 + # path: asciidocalypse/migration-zone/logstash-versioned-plugins From cd73476b2858e114c8aaf5afc8956e828e8589c4 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:04:47 +0100 Subject: [PATCH 03/10] Update version_plugin_docs_to_md.yml --- .github/workflows/version_plugin_docs_to_md.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 0ba0b70e..af88265f 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -52,7 +52,7 @@ jobs: - run: | docker run -dit --rm --name adoc-to-md \ -v ./logstash-docs:/doc/logstash-docs \ - -v out:/out \ + -v ./out:/out \ -e HISTFILE=/scripts/.bash_history \ adoc-builder From 3bd777b80aaf0f299f90c778ac157fcd7cb202d7 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:16:40 +0100 Subject: [PATCH 04/10] test --- .github/workflows/version_plugin_docs_to_md.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index af88265f..4915d102 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -52,9 +52,10 @@ jobs: - run: | docker run -dit --rm --name adoc-to-md \ -v ./logstash-docs:/doc/logstash-docs \ - -v ./out:/out \ -e HISTFILE=/scripts/.bash_history \ adoc-builder + + docker cp adoc-to-md:/out ./out - run: ls out From c254621835bf4ee054e32be640862ef59c47378d Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:19:01 +0100 Subject: [PATCH 05/10] tets --- .github/workflows/version_plugin_docs_to_md.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 4915d102..094d1718 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -55,6 +55,8 @@ jobs: -e HISTFILE=/scripts/.bash_history \ adoc-builder + sleep 30 + docker cp adoc-to-md:/out ./out - run: ls out From c2fd689cd82459aaeb1899447d9b20675dcb48ab Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:21:49 +0100 Subject: [PATCH 06/10] tryagain --- .../workflows/version_plugin_docs_to_md.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 094d1718..fdf1dd53 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -45,21 +45,9 @@ jobs: working-directory: ./adoc-to-md/src/docker run: ./create_image.sh - # - name: Migrate - # working-directory: ./asciidocalypse/migration-zone/logstash-versioned-plugins/scripts - # run: ./migrate.sh - - - run: | - docker run -dit --rm --name adoc-to-md \ - -v ./logstash-docs:/doc/logstash-docs \ - -e HISTFILE=/scripts/.bash_history \ - adoc-builder - - sleep 30 - - docker cp adoc-to-md:/out ./out - - - run: ls out + - name: Migrate + working-directory: ./asciidocalypse/migration-zone/logstash-versioned-plugins/scripts + run: ./migrate.sh # - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 # with: From 2d30cb14b997285ee578654ca19c3c36797ef806 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:32:00 +0100 Subject: [PATCH 07/10] debug --- .github/workflows/version_plugin_docs_to_md.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index fdf1dd53..15f2aa01 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -45,6 +45,9 @@ jobs: working-directory: ./adoc-to-md/src/docker run: ./create_image.sh + - name: Debug + run: ls logstash-docs/docs/versioned-plugins + - name: Migrate working-directory: ./asciidocalypse/migration-zone/logstash-versioned-plugins/scripts run: ./migrate.sh From c23f7499ba41ac69faab4ccde4c8676db42cf49c Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:36:27 +0100 Subject: [PATCH 08/10] test --- .github/workflows/version_plugin_docs_to_md.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 15f2aa01..8a0b27bd 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -41,6 +41,8 @@ jobs: token: ${{ secrets.ADOC_TO_MD_PAT }} persist-credentials: false + - run: docker volume create out + - name: Create docker image working-directory: ./adoc-to-md/src/docker run: ./create_image.sh From 2ed4cf1eca9599406c7d043eda102bd4e6a8c3ca Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 17 Mar 2025 23:39:56 +0100 Subject: [PATCH 09/10] test --- .github/workflows/version_plugin_docs_to_md.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 8a0b27bd..5ec7a8d8 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -41,18 +41,19 @@ jobs: token: ${{ secrets.ADOC_TO_MD_PAT }} persist-credentials: false - - run: docker volume create out - - name: Create docker image - working-directory: ./adoc-to-md/src/docker - run: ./create_image.sh + + run: | + cd ./adoc-to-md/src/docker + ./create_image.sh - name: Debug run: ls logstash-docs/docs/versioned-plugins - name: Migrate - working-directory: ./asciidocalypse/migration-zone/logstash-versioned-plugins/scripts - run: ./migrate.sh + run: | + cd ./asciidocalypse/migration-zone/logstash-versioned-plugins/scripts + ./migrate.sh # - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 # with: From 5b9fe3ac9a2e690b11a2125e39a3c55d23b475f8 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Tue, 18 Mar 2025 11:44:56 +0100 Subject: [PATCH 10/10] test --- .github/workflows/version_plugin_docs_to_md.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/version_plugin_docs_to_md.yml b/.github/workflows/version_plugin_docs_to_md.yml index 5ec7a8d8..45ac9b1a 100644 --- a/.github/workflows/version_plugin_docs_to_md.yml +++ b/.github/workflows/version_plugin_docs_to_md.yml @@ -30,6 +30,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: repository: elastic/adoc-to-md + ref: ci-adjustments path: adoc-to-md token: ${{ secrets.ADOC_TO_MD_PAT }} persist-credentials: false