From 603512e2278621e651f0833517a8121460f68618 Mon Sep 17 00:00:00 2001 From: default Date: Fri, 28 Mar 2025 03:08:39 +0000 Subject: [PATCH 01/11] Build and deploy from the devel branch once a week, preferably at the start of the week Fixes #2049 --- .github/workflows/weekly-build-devel.yaml | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/weekly-build-devel.yaml diff --git a/.github/workflows/weekly-build-devel.yaml b/.github/workflows/weekly-build-devel.yaml new file mode 100644 index 00000000000..5e2b2567b4f --- /dev/null +++ b/.github/workflows/weekly-build-devel.yaml @@ -0,0 +1,30 @@ +--- +name: Build and deploy docs +"on": + schedule: + # Run at 05:22 on Monday + - cron: '22 5 * * 1' + +jobs: + build-package-docs: + name: 📝 Build + uses: ./.github/workflows/reusable-build-docs.yaml + with: + repository-owner: 'ansible' + repository-name: 'ansible-documentation' + repository-branch: 'devel' + ansible-package-version: 'devel' + secrets: + DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} + + deploy-package-docs: + name: 🚀 Deploy + needs: build-package-docs + uses: ./.github/workflows/reusable-deploy-docs.yaml + with: + ansible-package-version: 'devel' + deployment-environment: test + repository-owner: 'ansible' + repository-branch: 'devel' + secrets: + DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} From 9427a24857951d6094ab29fcdf902359d0eddd36 Mon Sep 17 00:00:00 2001 From: default Date: Tue, 8 Apr 2025 19:33:19 +0000 Subject: [PATCH 02/11] Base Fixups --- .github/workflows/weekly-build-devel.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/weekly-build-devel.yaml b/.github/workflows/weekly-build-devel.yaml index 5e2b2567b4f..b32e35b7322 100644 --- a/.github/workflows/weekly-build-devel.yaml +++ b/.github/workflows/weekly-build-devel.yaml @@ -2,17 +2,15 @@ name: Build and deploy docs "on": schedule: - # Run at 05:22 on Monday - - cron: '22 5 * * 1' + # Run at 05:22 on Monday, Wednesday + - cron: '22 5 * * 1,3' jobs: build-package-docs: name: 📝 Build uses: ./.github/workflows/reusable-build-docs.yaml with: - repository-owner: 'ansible' - repository-name: 'ansible-documentation' - repository-branch: 'devel' + repository-branch: 'stable-2.18' ansible-package-version: 'devel' secrets: DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} @@ -24,7 +22,6 @@ jobs: with: ansible-package-version: 'devel' deployment-environment: test - repository-owner: 'ansible' - repository-branch: 'devel' + repository-branch: 'stable-2.18' secrets: DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} From 83c93deaeadf3cc6329495f8d1562f6f3b1e47bc Mon Sep 17 00:00:00 2001 From: default Date: Tue, 8 Apr 2025 19:37:18 +0000 Subject: [PATCH 03/11] Change to Daily --- .github/workflows/weekly-build-devel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/weekly-build-devel.yaml b/.github/workflows/weekly-build-devel.yaml index b32e35b7322..e5ca60f53c7 100644 --- a/.github/workflows/weekly-build-devel.yaml +++ b/.github/workflows/weekly-build-devel.yaml @@ -2,8 +2,8 @@ name: Build and deploy docs "on": schedule: - # Run at 05:22 on Monday, Wednesday - - cron: '22 5 * * 1,3' + # Run at 05:22 on daily + - cron: '22 5 * * *' jobs: build-package-docs: From c2b65e1f92065f033574c22d6d9eb6c9141d0d6b Mon Sep 17 00:00:00 2001 From: default Date: Mon, 21 Apr 2025 15:31:47 +0000 Subject: [PATCH 04/11] Fixes #2049 & #2050 --- ...uild-devel.yaml => build-devel-daily.yaml} | 4 +-- .github/workflows/build-latest-weekly.yaml | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) rename .github/workflows/{weekly-build-devel.yaml => build-devel-daily.yaml} (90%) create mode 100644 .github/workflows/build-latest-weekly.yaml diff --git a/.github/workflows/weekly-build-devel.yaml b/.github/workflows/build-devel-daily.yaml similarity index 90% rename from .github/workflows/weekly-build-devel.yaml rename to .github/workflows/build-devel-daily.yaml index e5ca60f53c7..55f7e9a2526 100644 --- a/.github/workflows/weekly-build-devel.yaml +++ b/.github/workflows/build-devel-daily.yaml @@ -1,8 +1,8 @@ --- -name: Build and deploy docs +name: Build and deploy devel docs - daily "on": schedule: - # Run at 05:22 on daily + # Run at 05:22 daily - cron: '22 5 * * *' jobs: diff --git a/.github/workflows/build-latest-weekly.yaml b/.github/workflows/build-latest-weekly.yaml new file mode 100644 index 00000000000..44a9896be82 --- /dev/null +++ b/.github/workflows/build-latest-weekly.yaml @@ -0,0 +1,27 @@ +--- +name: Build and deploy latest docs - weekly +"on": + schedule: + # Run at 05:41 on Monday + - cron: '41 5 * * 1' + +jobs: + build-package-docs: + name: 📝 Build + uses: ./.github/workflows/reusable-build-docs.yaml + with: + repository-branch: 'stable-2.18' + ansible-package-version: '11' + secrets: + DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} + + deploy-package-docs: + name: 🚀 Deploy + needs: build-package-docs + uses: ./.github/workflows/reusable-deploy-docs.yaml + with: + ansible-package-version: '11' + deployment-environment: production + repository-branch: 'stable-2.18' + secrets: + DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} From a6b378c787a481affeba547e57b778b531780b6c Mon Sep 17 00:00:00 2001 From: default Date: Mon, 21 Apr 2025 16:50:12 +0000 Subject: [PATCH 05/11] After some testing, this example works otherwise unmondified if we bump this to fedora 40 (41 and 42 had other failures and would require additional investigation/modification) --- .../rst/getting_started_ee/yaml/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml b/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml index b6f51e5e33e..29ac0fee5c7 100644 --- a/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml +++ b/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml @@ -2,7 +2,7 @@ version: 3 images: base_image: - name: quay.io/fedora/fedora:39 + name: quay.io/fedora/fedora:40 dependencies: ansible_core: From db9d58afe7734386deb87c60fb85bf34afaeb337 Mon Sep 17 00:00:00 2001 From: default Date: Fri, 28 Mar 2025 03:08:39 +0000 Subject: [PATCH 06/11] Schedule doc builds for devel and latest Fixes #2049 and #2050 (cherry picked from commit f6a8f2e73beb346213b071f21bf09e78a7c6fff9) --- .github/workflows/build-devel-daily.yaml | 27 ++++++++++++++++++++++ .github/workflows/build-latest-weekly.yaml | 27 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 .github/workflows/build-devel-daily.yaml create mode 100644 .github/workflows/build-latest-weekly.yaml diff --git a/.github/workflows/build-devel-daily.yaml b/.github/workflows/build-devel-daily.yaml new file mode 100644 index 00000000000..55f7e9a2526 --- /dev/null +++ b/.github/workflows/build-devel-daily.yaml @@ -0,0 +1,27 @@ +--- +name: Build and deploy devel docs - daily +"on": + schedule: + # Run at 05:22 daily + - cron: '22 5 * * *' + +jobs: + build-package-docs: + name: 📝 Build + uses: ./.github/workflows/reusable-build-docs.yaml + with: + repository-branch: 'stable-2.18' + ansible-package-version: 'devel' + secrets: + DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} + + deploy-package-docs: + name: 🚀 Deploy + needs: build-package-docs + uses: ./.github/workflows/reusable-deploy-docs.yaml + with: + ansible-package-version: 'devel' + deployment-environment: test + repository-branch: 'stable-2.18' + secrets: + DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} diff --git a/.github/workflows/build-latest-weekly.yaml b/.github/workflows/build-latest-weekly.yaml new file mode 100644 index 00000000000..44a9896be82 --- /dev/null +++ b/.github/workflows/build-latest-weekly.yaml @@ -0,0 +1,27 @@ +--- +name: Build and deploy latest docs - weekly +"on": + schedule: + # Run at 05:41 on Monday + - cron: '41 5 * * 1' + +jobs: + build-package-docs: + name: 📝 Build + uses: ./.github/workflows/reusable-build-docs.yaml + with: + repository-branch: 'stable-2.18' + ansible-package-version: '11' + secrets: + DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} + + deploy-package-docs: + name: 🚀 Deploy + needs: build-package-docs + uses: ./.github/workflows/reusable-deploy-docs.yaml + with: + ansible-package-version: '11' + deployment-environment: production + repository-branch: 'stable-2.18' + secrets: + DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} From 41970e12aba848ba2042fc279794b43df7a745b1 Mon Sep 17 00:00:00 2001 From: Don Naro Date: Tue, 22 Apr 2025 10:51:29 +0100 Subject: [PATCH 07/11] rename workflows and rm inputs with defaults (cherry picked from commit 883a23d1dfcbc954b9edb0e8ba17ac590c9fcdd5) --- .../{build-devel-daily.yaml => build-devel-docs.yaml} | 7 +------ .../{build-latest-weekly.yaml => build-latest-docs.yaml} | 0 2 files changed, 1 insertion(+), 6 deletions(-) rename .github/workflows/{build-devel-daily.yaml => build-devel-docs.yaml} (71%) rename .github/workflows/{build-latest-weekly.yaml => build-latest-docs.yaml} (100%) diff --git a/.github/workflows/build-devel-daily.yaml b/.github/workflows/build-devel-docs.yaml similarity index 71% rename from .github/workflows/build-devel-daily.yaml rename to .github/workflows/build-devel-docs.yaml index 55f7e9a2526..10c31fa0f7d 100644 --- a/.github/workflows/build-devel-daily.yaml +++ b/.github/workflows/build-devel-docs.yaml @@ -9,9 +9,6 @@ jobs: build-package-docs: name: 📝 Build uses: ./.github/workflows/reusable-build-docs.yaml - with: - repository-branch: 'stable-2.18' - ansible-package-version: 'devel' secrets: DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} @@ -20,8 +17,6 @@ jobs: needs: build-package-docs uses: ./.github/workflows/reusable-deploy-docs.yaml with: - ansible-package-version: 'devel' - deployment-environment: test - repository-branch: 'stable-2.18' + deployment-environment: production secrets: DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} diff --git a/.github/workflows/build-latest-weekly.yaml b/.github/workflows/build-latest-docs.yaml similarity index 100% rename from .github/workflows/build-latest-weekly.yaml rename to .github/workflows/build-latest-docs.yaml From e14d91089404c5d7b63923fc4706ce2843a5bea7 Mon Sep 17 00:00:00 2001 From: Don Naro Date: Tue, 22 Apr 2025 10:58:37 +0100 Subject: [PATCH 08/11] add single quotes for consistency (cherry picked from commit 835340d1de39c29a00e7ee637f02fc456ef36ad6) --- .github/workflows/build-devel-docs.yaml | 2 +- .github/workflows/build-latest-docs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-devel-docs.yaml b/.github/workflows/build-devel-docs.yaml index 10c31fa0f7d..d393a61fca8 100644 --- a/.github/workflows/build-devel-docs.yaml +++ b/.github/workflows/build-devel-docs.yaml @@ -17,6 +17,6 @@ jobs: needs: build-package-docs uses: ./.github/workflows/reusable-deploy-docs.yaml with: - deployment-environment: production + deployment-environment: 'production' secrets: DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} diff --git a/.github/workflows/build-latest-docs.yaml b/.github/workflows/build-latest-docs.yaml index 44a9896be82..36f0c034f1b 100644 --- a/.github/workflows/build-latest-docs.yaml +++ b/.github/workflows/build-latest-docs.yaml @@ -21,7 +21,7 @@ jobs: uses: ./.github/workflows/reusable-deploy-docs.yaml with: ansible-package-version: '11' - deployment-environment: production + deployment-environment: 'production' repository-branch: 'stable-2.18' secrets: DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} From c2ea7ce7299d0a6799a551213ba936f55eb99583 Mon Sep 17 00:00:00 2001 From: Don Naro Date: Tue, 22 Apr 2025 10:59:45 +0100 Subject: [PATCH 09/11] update workflow names (cherry picked from commit bd29aaa23b666086d887eb4a7e8380171c1b9f17) --- .github/workflows/build-devel-docs.yaml | 2 +- .github/workflows/build-latest-docs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-devel-docs.yaml b/.github/workflows/build-devel-docs.yaml index d393a61fca8..115908c88be 100644 --- a/.github/workflows/build-devel-docs.yaml +++ b/.github/workflows/build-devel-docs.yaml @@ -1,5 +1,5 @@ --- -name: Build and deploy devel docs - daily +name: Scheduled build for devel docs "on": schedule: # Run at 05:22 daily diff --git a/.github/workflows/build-latest-docs.yaml b/.github/workflows/build-latest-docs.yaml index 36f0c034f1b..812562ad2f4 100644 --- a/.github/workflows/build-latest-docs.yaml +++ b/.github/workflows/build-latest-docs.yaml @@ -1,5 +1,5 @@ --- -name: Build and deploy latest docs - weekly +name: Scheduled build for latest docs "on": schedule: # Run at 05:41 on Monday From c33cfe18b110c5f3d251df569a336ff20782c206 Mon Sep 17 00:00:00 2001 From: x1101 Date: Tue, 22 Apr 2025 10:27:53 -0400 Subject: [PATCH 10/11] Revert "After some testing, this example works otherwise unmondified if we bump this to fedora 40 (41 and 42 had other failures and would require additional investigation/modification)" This reverts commit a6b378c787a481affeba547e57b778b531780b6c. --- .../rst/getting_started_ee/yaml/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml b/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml index 29ac0fee5c7..b6f51e5e33e 100644 --- a/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml +++ b/docs/docsite/rst/getting_started_ee/yaml/execution-environment.yml @@ -2,7 +2,7 @@ version: 3 images: base_image: - name: quay.io/fedora/fedora:40 + name: quay.io/fedora/fedora:39 dependencies: ansible_core: From 9356d6a0908dc3885f26e29b8d1f77081454d4a2 Mon Sep 17 00:00:00 2001 From: default Date: Tue, 22 Apr 2025 14:34:38 +0000 Subject: [PATCH 11/11] Cleanup legacy files from rename --- .github/workflows/build-devel-daily.yaml | 27 ---------------------- .github/workflows/build-latest-weekly.yaml | 27 ---------------------- 2 files changed, 54 deletions(-) delete mode 100644 .github/workflows/build-devel-daily.yaml delete mode 100644 .github/workflows/build-latest-weekly.yaml diff --git a/.github/workflows/build-devel-daily.yaml b/.github/workflows/build-devel-daily.yaml deleted file mode 100644 index 55f7e9a2526..00000000000 --- a/.github/workflows/build-devel-daily.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: Build and deploy devel docs - daily -"on": - schedule: - # Run at 05:22 daily - - cron: '22 5 * * *' - -jobs: - build-package-docs: - name: 📝 Build - uses: ./.github/workflows/reusable-build-docs.yaml - with: - repository-branch: 'stable-2.18' - ansible-package-version: 'devel' - secrets: - DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} - - deploy-package-docs: - name: 🚀 Deploy - needs: build-package-docs - uses: ./.github/workflows/reusable-deploy-docs.yaml - with: - ansible-package-version: 'devel' - deployment-environment: test - repository-branch: 'stable-2.18' - secrets: - DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }} diff --git a/.github/workflows/build-latest-weekly.yaml b/.github/workflows/build-latest-weekly.yaml deleted file mode 100644 index 44a9896be82..00000000000 --- a/.github/workflows/build-latest-weekly.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: Build and deploy latest docs - weekly -"on": - schedule: - # Run at 05:41 on Monday - - cron: '41 5 * * 1' - -jobs: - build-package-docs: - name: 📝 Build - uses: ./.github/workflows/reusable-build-docs.yaml - with: - repository-branch: 'stable-2.18' - ansible-package-version: '11' - secrets: - DOCS_BOT_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }} - - deploy-package-docs: - name: 🚀 Deploy - needs: build-package-docs - uses: ./.github/workflows/reusable-deploy-docs.yaml - with: - ansible-package-version: '11' - deployment-environment: production - repository-branch: 'stable-2.18' - secrets: - DEPLOY_DOC_BUILD: ${{ secrets.DEPLOY_DOC_BUILD }}