From abcdd9cc094670fcb32d841c565ace77a5019e65 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 14:53:29 +0300 Subject: [PATCH 01/13] Added workflow to update asdf tools --- .github/workflows/update-tool-versions.yml | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .github/workflows/update-tool-versions.yml diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml new file mode 100644 index 0000000..fddccf8 --- /dev/null +++ b/.github/workflows/update-tool-versions.yml @@ -0,0 +1,55 @@ +name: Tooling + +on: + schedule: + - cron: "0 0 * * MON" + workflow_dispatch: ~ + +env: + ASDF_DEFAULT_TOOL_VERSIONS_FILENAME: asdf/tool-versions + +jobs: + tooling: + name: Update tooling + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Install asdf + uses: asdf-vm/actions/install@v2 + - name: Configure asdf plugins + run: | + asdf plugin add deno + asdf plugin add github-cli + asdf plugin add act + asdf plugin add bat + asdf plugin add delta + asdf plugin add dotnet + asdf plugin add nodejs + asdf plugin add tflint + asdf plugin add powershell-core + asdf plugin add broot https://github.com/cmur2/asdf-broot.git + asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git + asdf plugin add k9s https://github.com/looztra/asdf-k9s + asdf plugin add glow https://github.com/grimoh/asdf-glow.git + asdf plugin add stylua + asdf plugin add lazygit + asdf plugin add lazydocker https://github.com/comdotlinux/asdf-lazydocker.git + asdf plugin add editorconfig-checker + asdf plugin add actionlint + asdf plugin add hadolint + asdf plugin add tmux + asdf plugin add dust + asdf plugin add exa + asdf plugin add jsonnet + asdf plugin add jb + asdf plugin add pint + + - name: Update tooling + uses: ericcornelissen/tool-versions-update-action/commit@v0 + with: + not: powershell-core + - name: Log tooling changes + run: git diff .tool-versions From b8811e6531b844c0f971843fdf67c43d8e970521 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 14:55:12 +0300 Subject: [PATCH 02/13] Temporary added pull request event --- .github/workflows/update-tool-versions.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index fddccf8..9c7183e 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -4,6 +4,9 @@ on: schedule: - cron: "0 0 * * MON" workflow_dispatch: ~ + pull_request: + branches: + - master env: ASDF_DEFAULT_TOOL_VERSIONS_FILENAME: asdf/tool-versions From b6377536c43d1f0fdb04dc82dd99e7f501717ccb Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:01:34 +0300 Subject: [PATCH 03/13] Temporary workaround of updating non standard tool versions file --- .github/workflows/update-tool-versions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index 9c7183e..7451de2 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -20,6 +20,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Copy asdf/tool-versions to .tool-versions + run: cp asdf/tool-versions .tool-versions - name: Install asdf uses: asdf-vm/actions/install@v2 - name: Configure asdf plugins From e3cd36ea49cc9778935250d48930c2368fa53b96 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:11:54 +0300 Subject: [PATCH 04/13] Refactoring to fix issues --- .github/workflows/update-tool-versions.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index 7451de2..70dacd0 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -20,10 +20,13 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Copy asdf/tool-versions to .tool-versions run: cp asdf/tool-versions .tool-versions + - name: Install asdf uses: asdf-vm/actions/install@v2 + - name: Configure asdf plugins run: | asdf plugin add deno @@ -35,13 +38,8 @@ jobs: asdf plugin add nodejs asdf plugin add tflint asdf plugin add powershell-core - asdf plugin add broot https://github.com/cmur2/asdf-broot.git - asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git - asdf plugin add k9s https://github.com/looztra/asdf-k9s - asdf plugin add glow https://github.com/grimoh/asdf-glow.git asdf plugin add stylua asdf plugin add lazygit - asdf plugin add lazydocker https://github.com/comdotlinux/asdf-lazydocker.git asdf plugin add editorconfig-checker asdf plugin add actionlint asdf plugin add hadolint @@ -56,5 +54,9 @@ jobs: uses: ericcornelissen/tool-versions-update-action/commit@v0 with: not: powershell-core - - name: Log tooling changes - run: git diff .tool-versions + plugins: | + broot https://github.com/cmur2/asdf-broot.git + poetry https://github.com/asdf-community/asdf-poetry.git + k9s https://github.com/looztra/asdf-k9s + glow https://github.com/grimoh/asdf-glow.git + lazydocker https://github.com/comdotlinux/asdf-lazydocker.git From 3e9ab4c4dcc45d70658b95a53253fe7ab62236a3 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:27:30 +0300 Subject: [PATCH 05/13] Fixed plugins install issue --- .github/workflows/update-tool-versions.yml | 56 ++++++++++------------ 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index 70dacd0..b6fc49a 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -8,8 +8,8 @@ on: branches: - master -env: - ASDF_DEFAULT_TOOL_VERSIONS_FILENAME: asdf/tool-versions +# env: +# ASDF_DEFAULT_TOOL_VERSIONS_FILENAME: asdf/tool-versions jobs: tooling: @@ -27,36 +27,30 @@ jobs: - name: Install asdf uses: asdf-vm/actions/install@v2 - - name: Configure asdf plugins - run: | - asdf plugin add deno - asdf plugin add github-cli - asdf plugin add act - asdf plugin add bat - asdf plugin add delta - asdf plugin add dotnet - asdf plugin add nodejs - asdf plugin add tflint - asdf plugin add powershell-core - asdf plugin add stylua - asdf plugin add lazygit - asdf plugin add editorconfig-checker - asdf plugin add actionlint - asdf plugin add hadolint - asdf plugin add tmux - asdf plugin add dust - asdf plugin add exa - asdf plugin add jsonnet - asdf plugin add jb - asdf plugin add pint + # - name: Configure asdf plugins + # run: | + # asdf plugin add deno + # asdf plugin add github-cli + # asdf plugin add act + # asdf plugin add bat + # asdf plugin add delta + # asdf plugin add dotnet + # asdf plugin add nodejs + # asdf plugin add tflint + # asdf plugin add powershell-core + # asdf plugin add stylua + # asdf plugin add lazygit + # asdf plugin add editorconfig-checker + # asdf plugin add actionlint + # asdf plugin add hadolint + # asdf plugin add tmux + # asdf plugin add dust + # asdf plugin add exa + # asdf plugin add jsonnet + # asdf plugin add jb + # asdf plugin add pint - name: Update tooling uses: ericcornelissen/tool-versions-update-action/commit@v0 with: - not: powershell-core - plugins: | - broot https://github.com/cmur2/asdf-broot.git - poetry https://github.com/asdf-community/asdf-poetry.git - k9s https://github.com/looztra/asdf-k9s - glow https://github.com/grimoh/asdf-glow.git - lazydocker https://github.com/comdotlinux/asdf-lazydocker.git + not: powershell-core, broot, lazydocker From 79b4b8f28ed5529e121a164e25987d593314a93a Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:30:40 +0300 Subject: [PATCH 06/13] Temporary excluded broot --- asdf/tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asdf/tool-versions b/asdf/tool-versions index 0a2534f..b0a6771 100644 --- a/asdf/tool-versions +++ b/asdf/tool-versions @@ -7,7 +7,7 @@ dotnet 6.0.408 nodejs 16.19.0 powershell-core 7.3.0 tflint 0.46.1 -broot 1.22.1 +# broot 1.22.1 poetry 1.2.2 k9s 0.26.7 glow 1.5.0 From 657499a35a33a2b259895e1a87bc36335b2cf45d Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:32:27 +0300 Subject: [PATCH 07/13] Temporary removed lazydocker --- asdf/tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asdf/tool-versions b/asdf/tool-versions index b0a6771..38c00f3 100644 --- a/asdf/tool-versions +++ b/asdf/tool-versions @@ -13,7 +13,7 @@ k9s 0.26.7 glow 1.5.0 stylua 0.17.1 lazygit 0.38.2 -lazydocker 0.20.0 +# lazydocker 0.20.0 editorconfig-checker 2.7.0 actionlint 1.6.24 hadolint 2.12.0 From c20400820abcfbfdf87beafcbe4dc19f616adf18 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:39:31 +0300 Subject: [PATCH 08/13] Fixed glow package issue --- asdf/tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asdf/tool-versions b/asdf/tool-versions index 38c00f3..0796f91 100644 --- a/asdf/tool-versions +++ b/asdf/tool-versions @@ -10,7 +10,7 @@ tflint 0.46.1 # broot 1.22.1 poetry 1.2.2 k9s 0.26.7 -glow 1.5.0 +glow 1.5.1 stylua 0.17.1 lazygit 0.38.2 # lazydocker 0.20.0 From 7f326a443a8bfd7560ad3706a0800fb5de88587d Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:46:24 +0300 Subject: [PATCH 09/13] Fixing update issues --- .github/workflows/update-tool-versions.yml | 8 ++++---- .tool-versions | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 .tool-versions diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index b6fc49a..126a0ad 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -21,11 +21,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Copy asdf/tool-versions to .tool-versions - run: cp asdf/tool-versions .tool-versions + # - name: Copy asdf/tool-versions to .tool-versions + # run: cp asdf/tool-versions .tool-versions - - name: Install asdf - uses: asdf-vm/actions/install@v2 + # - name: Install asdf + # uses: asdf-vm/actions/install@v2 # - name: Configure asdf plugins # run: | diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..0796f91 --- /dev/null +++ b/.tool-versions @@ -0,0 +1,24 @@ +deno 1.34.2 +github-cli 2.30.0 +act 0.2.46 +bat 0.23.0 +delta 0.15.1 +dotnet 6.0.408 +nodejs 16.19.0 +powershell-core 7.3.0 +tflint 0.46.1 +# broot 1.22.1 +poetry 1.2.2 +k9s 0.26.7 +glow 1.5.1 +stylua 0.17.1 +lazygit 0.38.2 +# lazydocker 0.20.0 +editorconfig-checker 2.7.0 +actionlint 1.6.24 +hadolint 2.12.0 +dust 0.8.5 +exa 0.10.1 +jsonnet 0.20.0 +jb 0.5.1 +pint 0.44.1 From e11a62369813e2fb24c26c27866a261599381076 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 15:55:31 +0300 Subject: [PATCH 10/13] Added permission to commit changes --- .github/workflows/update-tool-versions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index 126a0ad..059356b 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -16,6 +16,7 @@ jobs: name: Update tooling runs-on: ubuntu-latest permissions: + contents: write pull-requests: write steps: - name: Checkout repository From dd4f0cca15a29ee8f36d4261b15ce2c0a1047197 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 16:26:32 +0300 Subject: [PATCH 11/13] Cleanup --- .github/workflows/update-tool-versions.yml | 30 ++-------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index 059356b..cc9922c 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -8,8 +8,8 @@ on: branches: - master -# env: -# ASDF_DEFAULT_TOOL_VERSIONS_FILENAME: asdf/tool-versions +env: + ASDF_DEFAULT_TOOL_VERSIONS_FILENAME: asdf/tool-versions jobs: tooling: @@ -25,32 +25,6 @@ jobs: # - name: Copy asdf/tool-versions to .tool-versions # run: cp asdf/tool-versions .tool-versions - # - name: Install asdf - # uses: asdf-vm/actions/install@v2 - - # - name: Configure asdf plugins - # run: | - # asdf plugin add deno - # asdf plugin add github-cli - # asdf plugin add act - # asdf plugin add bat - # asdf plugin add delta - # asdf plugin add dotnet - # asdf plugin add nodejs - # asdf plugin add tflint - # asdf plugin add powershell-core - # asdf plugin add stylua - # asdf plugin add lazygit - # asdf plugin add editorconfig-checker - # asdf plugin add actionlint - # asdf plugin add hadolint - # asdf plugin add tmux - # asdf plugin add dust - # asdf plugin add exa - # asdf plugin add jsonnet - # asdf plugin add jb - # asdf plugin add pint - - name: Update tooling uses: ericcornelissen/tool-versions-update-action/commit@v0 with: From be7060c72d09d1016db9116684c78b9c1c3eb453 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 16:42:06 +0300 Subject: [PATCH 12/13] Cleanup --- .github/workflows/update-tool-versions.yml | 3 --- .tool-versions | 24 ---------------------- 2 files changed, 27 deletions(-) delete mode 100644 .tool-versions diff --git a/.github/workflows/update-tool-versions.yml b/.github/workflows/update-tool-versions.yml index cc9922c..10b0d13 100644 --- a/.github/workflows/update-tool-versions.yml +++ b/.github/workflows/update-tool-versions.yml @@ -22,9 +22,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - # - name: Copy asdf/tool-versions to .tool-versions - # run: cp asdf/tool-versions .tool-versions - - name: Update tooling uses: ericcornelissen/tool-versions-update-action/commit@v0 with: diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 0796f91..0000000 --- a/.tool-versions +++ /dev/null @@ -1,24 +0,0 @@ -deno 1.34.2 -github-cli 2.30.0 -act 0.2.46 -bat 0.23.0 -delta 0.15.1 -dotnet 6.0.408 -nodejs 16.19.0 -powershell-core 7.3.0 -tflint 0.46.1 -# broot 1.22.1 -poetry 1.2.2 -k9s 0.26.7 -glow 1.5.1 -stylua 0.17.1 -lazygit 0.38.2 -# lazydocker 0.20.0 -editorconfig-checker 2.7.0 -actionlint 1.6.24 -hadolint 2.12.0 -dust 0.8.5 -exa 0.10.1 -jsonnet 0.20.0 -jb 0.5.1 -pint 0.44.1 From 4b6ec2de836b546c52e7b694813dbf5964124794 Mon Sep 17 00:00:00 2001 From: Mykola Shestopal Date: Tue, 25 Jul 2023 17:00:27 +0300 Subject: [PATCH 13/13] Added hacky workaround temporary --- .tool-versions | 1 + 1 file changed, 1 insertion(+) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..c6cac69 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +empty