From d08d9c7ee17348ff0a5be991f99aceef9753c9ff Mon Sep 17 00:00:00 2001
From: Sandor Semsey <sandor@es-progress.hu>
Date: Mon, 28 Apr 2025 18:05:21 +0200
Subject: [PATCH 1/2] CI: use ubuntu-22.04 runner

---
 .github/workflows/beautysh.yml       | 2 +-
 .github/workflows/github-release.yml | 2 +-
 .github/workflows/mkdocs.yml         | 2 +-
 .github/workflows/php-cs-fixer.yml   | 2 +-
 .github/workflows/prettier.yml       | 2 +-
 .github/workflows/shellcheck.yml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/beautysh.yml b/.github/workflows/beautysh.yml
index 32d5d5a..4648437 100644
--- a/.github/workflows/beautysh.yml
+++ b/.github/workflows/beautysh.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   beautysh:
     name: Run beautysh
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Self checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 036469d..87ebe94 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   release:
     name: Release ${{ inputs.tag }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Create GitHub release
         env:
diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml
index 31ae19a..0cf8d51 100644
--- a/.github/workflows/mkdocs.yml
+++ b/.github/workflows/mkdocs.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   deploy:
     name: Deploy to gh-pages
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Self check out
         uses: actions/checkout@v4
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
index ddc2f3f..613dcba 100644
--- a/.github/workflows/php-cs-fixer.yml
+++ b/.github/workflows/php-cs-fixer.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   php-cs-fixer:
     name: Run php-cs-fixer
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Self checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
index 27752e2..0301cef 100644
--- a/.github/workflows/prettier.yml
+++ b/.github/workflows/prettier.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   prettier:
     name: Run prettier
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Self checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 69b1275..dd8b163 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -20,7 +20,7 @@ on:
 jobs:
   shellcheck:
     name: Run shellcheck
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Self checkout
         uses: actions/checkout@v4

From a826350c9c26b5373e0e69fa5c42b1a3361bdefb Mon Sep 17 00:00:00 2001
From: Sandor Semsey <sandor@es-progress.hu>
Date: Mon, 28 Apr 2025 19:34:52 +0200
Subject: [PATCH 2/2] CI/beautysh: use pyhton version 3.x

---
 .github/workflows/beautysh.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/beautysh.yml b/.github/workflows/beautysh.yml
index 4648437..c0e1b12 100644
--- a/.github/workflows/beautysh.yml
+++ b/.github/workflows/beautysh.yml
@@ -23,12 +23,14 @@ jobs:
       - name: Create requirements.txt
         run: |
           mkdir -p .github/workflows/es-progress/.github
-          echo beautysh > .github/workflows/es-progress/.github/requirements.txt
+          # it seems beautysh in Python 3.11+ requires setuptools explicitly
+          echo setuptools > .github/workflows/es-progress/.github/requirements.txt
+          echo beautysh >> .github/workflows/es-progress/.github/requirements.txt
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.x
           cache: pip
           cache-dependency-path: .github/workflows/es-progress/.github/requirements.txt