From f30505b17848db936c49537f8b70cfffaff36052 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 8 Aug 2024 11:29:15 +0200 Subject: [PATCH 1/5] updatecli: pass the username to fix the issue with auth --- .github/workflows/updatecli.d/bump-elastic-stack-version.yml | 1 + .github/workflows/updatecli.d/bump-latest-7x-version.yml | 1 + .github/workflows/updatecli.d/bump-latest-snapshot-version.yml | 1 + .github/workflows/updatecli.d/bump-package-registry-version.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/updatecli.d/bump-elastic-stack-version.yml b/.github/workflows/updatecli.d/bump-elastic-stack-version.yml index f80b01a29..44895be74 100644 --- a/.github/workflows/updatecli.d/bump-elastic-stack-version.yml +++ b/.github/workflows/updatecli.d/bump-elastic-stack-version.yml @@ -19,6 +19,7 @@ scms: owner: '{{ .scm.owner }}' repository: '{{ .scm.repository }}' user: '{{ requiredEnv "GITHUB_ACTOR" }}' + username: '{{ requiredEnv "GITHUB_ACTOR" }}' token: '{{ requiredEnv "GITHUB_TOKEN" }}' commitusingapi: true branch: main diff --git a/.github/workflows/updatecli.d/bump-latest-7x-version.yml b/.github/workflows/updatecli.d/bump-latest-7x-version.yml index 2dc2c14ee..c35d8cbc3 100644 --- a/.github/workflows/updatecli.d/bump-latest-7x-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-7x-version.yml @@ -19,6 +19,7 @@ scms: owner: '{{ .scm.owner }}' repository: '{{ .scm.repository }}' user: '{{ requiredEnv "GITHUB_ACTOR" }}' + username: '{{ requiredEnv "GITHUB_ACTOR" }}' token: '{{ requiredEnv "GITHUB_TOKEN" }}' commitusingapi: true branch: main diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index f0602b740..301d43940 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -19,6 +19,7 @@ scms: owner: '{{ .scm.owner }}' repository: '{{ .scm.repository }}' user: '{{ requiredEnv "GITHUB_ACTOR" }}' + username: '{{ requiredEnv "GITHUB_ACTOR" }}' token: '{{ requiredEnv "GITHUB_TOKEN" }}' commitusingapi: true branch: main diff --git a/.github/workflows/updatecli.d/bump-package-registry-version.yml b/.github/workflows/updatecli.d/bump-package-registry-version.yml index b6bdf681e..31f7efbe4 100644 --- a/.github/workflows/updatecli.d/bump-package-registry-version.yml +++ b/.github/workflows/updatecli.d/bump-package-registry-version.yml @@ -19,6 +19,7 @@ scms: owner: '{{ .scm.owner }}' repository: '{{ .scm.repository }}' user: '{{ requiredEnv "GITHUB_ACTOR" }}' + username: '{{ requiredEnv "GITHUB_ACTOR" }}' token: '{{ requiredEnv "GITHUB_TOKEN" }}' commitusingapi: true branch: main From c5db2da27828e9f9c864e65ba01e7df578e102d8 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 8 Aug 2024 11:29:32 +0200 Subject: [PATCH 2/5] bump version --- .github/workflows/bump-elastic-stack-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-elastic-stack-version.yml b/.github/workflows/bump-elastic-stack-version.yml index ed37d9cc0..265fcc7e3 100644 --- a/.github/workflows/bump-elastic-stack-version.yml +++ b/.github/workflows/bump-elastic-stack-version.yml @@ -35,7 +35,7 @@ jobs: echo "UPDATECLI_ACTION=apply" >> $GITHUB_ENV - name: Install Updatecli in the runner - uses: updatecli/updatecli-action@v2.62.0 + uses: updatecli/updatecli-action@3a8785d88ec4fa03d86521a181f37c0e74627463 #v2.64.0 - name: Update default stack version # --experimental needed for commitusingapi option. From 1c5b5f80ea41973d6ba809ac0eafc8909cc64edd Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 8 Aug 2024 11:32:46 +0200 Subject: [PATCH 3/5] simplify --- .../workflows/bump-elastic-stack-version.yml | 20 +------------------ .../bump-elastic-stack-version.yml | 0 .../updatecli.d/bump-latest-7x-version.yml | 0 .../bump-latest-snapshot-version.yml | 0 .../bump-package-registry-version.yml | 0 .../values.d}/scm.yml | 0 6 files changed, 1 insertion(+), 19 deletions(-) rename {.github/workflows => updatecli}/updatecli.d/bump-elastic-stack-version.yml (100%) rename {.github/workflows => updatecli}/updatecli.d/bump-latest-7x-version.yml (100%) rename {.github/workflows => updatecli}/updatecli.d/bump-latest-snapshot-version.yml (100%) rename {.github/workflows => updatecli}/updatecli.d/bump-package-registry-version.yml (100%) rename {.github/workflows/updatecli.d => updatecli/values.d}/scm.yml (100%) diff --git a/.github/workflows/bump-elastic-stack-version.yml b/.github/workflows/bump-elastic-stack-version.yml index 265fcc7e3..cc44e8d5b 100644 --- a/.github/workflows/bump-elastic-stack-version.yml +++ b/.github/workflows/bump-elastic-stack-version.yml @@ -39,24 +39,6 @@ jobs: - name: Update default stack version # --experimental needed for commitusingapi option. - run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-elastic-stack-version.yml --values .github/workflows/updatecli.d/scm.yml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Update latest testing 7.x stack version - # --experimental needed for commitusingapi option. - run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-latest-7x-version.yml --values .github/workflows/updatecli.d/scm.yml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Update latest testing stack version - # --experimental needed for commitusingapi option. - run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-latest-snapshot-version.yml --values .github/workflows/updatecli.d/scm.yml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Update Package Registry version - # --experimental needed for commitusingapi option. - run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli.d/bump-package-registry-version.yml --values .github/workflows/updatecli.d/scm.yml + run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/updatecli.d/bump-elastic-stack-version.yml b/updatecli/updatecli.d/bump-elastic-stack-version.yml similarity index 100% rename from .github/workflows/updatecli.d/bump-elastic-stack-version.yml rename to updatecli/updatecli.d/bump-elastic-stack-version.yml diff --git a/.github/workflows/updatecli.d/bump-latest-7x-version.yml b/updatecli/updatecli.d/bump-latest-7x-version.yml similarity index 100% rename from .github/workflows/updatecli.d/bump-latest-7x-version.yml rename to updatecli/updatecli.d/bump-latest-7x-version.yml diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/updatecli/updatecli.d/bump-latest-snapshot-version.yml similarity index 100% rename from .github/workflows/updatecli.d/bump-latest-snapshot-version.yml rename to updatecli/updatecli.d/bump-latest-snapshot-version.yml diff --git a/.github/workflows/updatecli.d/bump-package-registry-version.yml b/updatecli/updatecli.d/bump-package-registry-version.yml similarity index 100% rename from .github/workflows/updatecli.d/bump-package-registry-version.yml rename to updatecli/updatecli.d/bump-package-registry-version.yml diff --git a/.github/workflows/updatecli.d/scm.yml b/updatecli/values.d/scm.yml similarity index 100% rename from .github/workflows/updatecli.d/scm.yml rename to updatecli/values.d/scm.yml From bb7a8ec49743cb17d81314d1ed83d4f13a2d499a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 8 Aug 2024 11:38:39 +0200 Subject: [PATCH 4/5] revert --- .github/workflows/bump-elastic-stack-version.yml | 2 +- .../updatecli}/updatecli.d/bump-elastic-stack-version.yml | 0 .../workflows/updatecli}/updatecli.d/bump-latest-7x-version.yml | 0 .../updatecli}/updatecli.d/bump-latest-snapshot-version.yml | 0 .../updatecli}/updatecli.d/bump-package-registry-version.yml | 0 {updatecli => .github/workflows/updatecli}/values.d/scm.yml | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename {updatecli => .github/workflows/updatecli}/updatecli.d/bump-elastic-stack-version.yml (100%) rename {updatecli => .github/workflows/updatecli}/updatecli.d/bump-latest-7x-version.yml (100%) rename {updatecli => .github/workflows/updatecli}/updatecli.d/bump-latest-snapshot-version.yml (100%) rename {updatecli => .github/workflows/updatecli}/updatecli.d/bump-package-registry-version.yml (100%) rename {updatecli => .github/workflows/updatecli}/values.d/scm.yml (100%) diff --git a/.github/workflows/bump-elastic-stack-version.yml b/.github/workflows/bump-elastic-stack-version.yml index cc44e8d5b..17ccf12bc 100644 --- a/.github/workflows/bump-elastic-stack-version.yml +++ b/.github/workflows/bump-elastic-stack-version.yml @@ -39,6 +39,6 @@ jobs: - name: Update default stack version # --experimental needed for commitusingapi option. - run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} + run: updatecli --experimental ${{ env.UPDATECLI_ACTION }} --config .github/workflows/updatecli --values .github/workflows/updatecli/values.d/scm.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/updatecli/updatecli.d/bump-elastic-stack-version.yml b/.github/workflows/updatecli/updatecli.d/bump-elastic-stack-version.yml similarity index 100% rename from updatecli/updatecli.d/bump-elastic-stack-version.yml rename to .github/workflows/updatecli/updatecli.d/bump-elastic-stack-version.yml diff --git a/updatecli/updatecli.d/bump-latest-7x-version.yml b/.github/workflows/updatecli/updatecli.d/bump-latest-7x-version.yml similarity index 100% rename from updatecli/updatecli.d/bump-latest-7x-version.yml rename to .github/workflows/updatecli/updatecli.d/bump-latest-7x-version.yml diff --git a/updatecli/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml similarity index 100% rename from updatecli/updatecli.d/bump-latest-snapshot-version.yml rename to .github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml diff --git a/updatecli/updatecli.d/bump-package-registry-version.yml b/.github/workflows/updatecli/updatecli.d/bump-package-registry-version.yml similarity index 100% rename from updatecli/updatecli.d/bump-package-registry-version.yml rename to .github/workflows/updatecli/updatecli.d/bump-package-registry-version.yml diff --git a/updatecli/values.d/scm.yml b/.github/workflows/updatecli/values.d/scm.yml similarity index 100% rename from updatecli/values.d/scm.yml rename to .github/workflows/updatecli/values.d/scm.yml From 6847563b9bbda13e3ed38913f28c55bec918ab34 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 8 Aug 2024 12:00:11 +0200 Subject: [PATCH 5/5] change paths --- .github/workflows/bump-elastic-stack-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-elastic-stack-version.yml b/.github/workflows/bump-elastic-stack-version.yml index 17ccf12bc..5a50e899f 100644 --- a/.github/workflows/bump-elastic-stack-version.yml +++ b/.github/workflows/bump-elastic-stack-version.yml @@ -7,7 +7,7 @@ on: - cron: '0 1 * * 1-5' pull_request: paths: - - .github/updatecli.d/* + - .github/workflows/updatecli/** - .github/workflows/bump-elastic-stack-version.yml permissions: