diff mbox series

github: bump Python and Ruby versions

Message ID 20240408154107.72419-1-cgoettsche@seltendoof.de (mailing list archive)
State New
Delegated to: Petr Lautrbach
Headers show
Series github: bump Python and Ruby versions | expand

Commit Message

Christian Göttsche April 8, 2024, 3:41 p.m. UTC
From: Christian Göttsche <cgzones@googlemail.com>

Bump the maximum Python version to 3.12 and the maximum Ruby version to
3.3 in the GitHub CI.

Also bump the setup-python action to v5.

Since Python 3.12 dropped setuptools, install manually.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 .github/workflows/run_tests.yml | 43 +++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 18 deletions(-)

Comments

James Carter April 24, 2024, 8:10 p.m. UTC | #1
On Mon, Apr 8, 2024 at 11:41 AM Christian Göttsche
<cgoettsche@seltendoof.de> wrote:
>
> From: Christian Göttsche <cgzones@googlemail.com>
>
> Bump the maximum Python version to 3.12 and the maximum Ruby version to
> 3.3 in the GitHub CI.
>
> Also bump the setup-python action to v5.
>
> Since Python 3.12 dropped setuptools, install manually.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  .github/workflows/run_tests.yml | 43 +++++++++++++++++++--------------
>  1 file changed, 25 insertions(+), 18 deletions(-)
>
> diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
> index 3bd859a3..f8b6f146 100644
> --- a/.github/workflows/run_tests.yml
> +++ b/.github/workflows/run_tests.yml
> @@ -10,36 +10,39 @@ jobs:
>        matrix:
>          compiler: [gcc, clang]
>          python-ruby-version:
> -          - {python: '3.11', ruby: '3.1'}
> -          - {python: '3.11', ruby: '3.1', other: 'test-flags-override'}
> -          - {python: '3.11', ruby: '3.1', other: 'test-debug'}
> -          - {python: '3.11', ruby: '3.1', other: 'linker-bfd'}
> -          - {python: '3.11', ruby: '3.1', other: 'linker-gold'}
> +          - {python: '3.12', ruby: '3.3'}
> +          - {python: '3.12', ruby: '3.3', other: 'test-flags-override'}
> +          - {python: '3.12', ruby: '3.3', other: 'test-debug'}
> +          - {python: '3.12', ruby: '3.3', other: 'linker-bfd'}
> +          - {python: '3.12', ruby: '3.3', other: 'linker-gold'}
>            # Test several Python versions with the latest Ruby version
> -          - {python: '3.10', ruby: '3.1'}
> -          - {python: '3.9', ruby: '3.1'}
> -          - {python: '3.8', ruby: '3.1'}
> -          - {python: '3.7', ruby: '3.1'}
> -          - {python: 'pypy3.7', ruby: '3.1'}
> +          - {python: '3.11', ruby: '3.3'}
> +          - {python: '3.10', ruby: '3.3'}
> +          - {python: '3.9', ruby: '3.3'}
> +          - {python: '3.8', ruby: '3.3'}
> +          - {python: '3.7', ruby: '3.3'}
> +          - {python: 'pypy3.7', ruby: '3.3'}
>            # Test several Ruby versions with the latest Python version
> -          - {python: '3.11', ruby: '3.0'}
> -          - {python: '3.11', ruby: '2.7'}
> -          - {python: '3.11', ruby: '2.6'}
> -          - {python: '3.11', ruby: '2.5'}
> +          - {python: '3.12', ruby: '3.2'}
> +          - {python: '3.12', ruby: '3.1'}
> +          - {python: '3.12', ruby: '3.0'}
> +          - {python: '3.12', ruby: '2.7'}
> +          - {python: '3.12', ruby: '2.6'}
> +          - {python: '3.12', ruby: '2.5'}
>          exclude:
>            - compiler: clang
> -            python-ruby-version: {python: '3.11', ruby: '3.1', other: 'linker-bfd'}
> +            python-ruby-version: {python: '3.12', ruby: '3.3', other: 'linker-bfd'}
>            - compiler: clang
> -            python-ruby-version: {python: '3.11', ruby: '3.1', other: 'linker-gold'}
> +            python-ruby-version: {python: '3.12', ruby: '3.3', other: 'linker-gold'}
>          include:
>            - compiler: gcc
> -            python-ruby-version: {python: '3.11', ruby: '3.1', other: 'sanitizers'}
> +            python-ruby-version: {python: '3.12', ruby: '3.3', other: 'sanitizers'}
>
>      steps:
>      - uses: actions/checkout@v4
>
>      - name: Set up Python ${{ matrix.python-ruby-version.python }}
> -      uses: actions/setup-python@v4
> +      uses: actions/setup-python@v5
>        with:
>          python-version: ${{ matrix.python-ruby-version.python }}
>
> @@ -69,6 +72,10 @@ jobs:
>
>          pip install flake8
>
> +    - name: Install Python setuptools
> +      if: matrix.python-ruby-version.python == '3.12'
> +      run: pip install setuptools
> +
>      - name: Install Clang
>        if: ${{ matrix.compiler == 'clang' }}
>        run: sudo apt-get install -qqy clang
> --
> 2.43.0
>
>
diff mbox series

Patch

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 3bd859a3..f8b6f146 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -10,36 +10,39 @@  jobs:
       matrix:
         compiler: [gcc, clang]
         python-ruby-version:
-          - {python: '3.11', ruby: '3.1'}
-          - {python: '3.11', ruby: '3.1', other: 'test-flags-override'}
-          - {python: '3.11', ruby: '3.1', other: 'test-debug'}
-          - {python: '3.11', ruby: '3.1', other: 'linker-bfd'}
-          - {python: '3.11', ruby: '3.1', other: 'linker-gold'}
+          - {python: '3.12', ruby: '3.3'}
+          - {python: '3.12', ruby: '3.3', other: 'test-flags-override'}
+          - {python: '3.12', ruby: '3.3', other: 'test-debug'}
+          - {python: '3.12', ruby: '3.3', other: 'linker-bfd'}
+          - {python: '3.12', ruby: '3.3', other: 'linker-gold'}
           # Test several Python versions with the latest Ruby version
-          - {python: '3.10', ruby: '3.1'}
-          - {python: '3.9', ruby: '3.1'}
-          - {python: '3.8', ruby: '3.1'}
-          - {python: '3.7', ruby: '3.1'}
-          - {python: 'pypy3.7', ruby: '3.1'}
+          - {python: '3.11', ruby: '3.3'}
+          - {python: '3.10', ruby: '3.3'}
+          - {python: '3.9', ruby: '3.3'}
+          - {python: '3.8', ruby: '3.3'}
+          - {python: '3.7', ruby: '3.3'}
+          - {python: 'pypy3.7', ruby: '3.3'}
           # Test several Ruby versions with the latest Python version
-          - {python: '3.11', ruby: '3.0'}
-          - {python: '3.11', ruby: '2.7'}
-          - {python: '3.11', ruby: '2.6'}
-          - {python: '3.11', ruby: '2.5'}
+          - {python: '3.12', ruby: '3.2'}
+          - {python: '3.12', ruby: '3.1'}
+          - {python: '3.12', ruby: '3.0'}
+          - {python: '3.12', ruby: '2.7'}
+          - {python: '3.12', ruby: '2.6'}
+          - {python: '3.12', ruby: '2.5'}
         exclude:
           - compiler: clang
-            python-ruby-version: {python: '3.11', ruby: '3.1', other: 'linker-bfd'}
+            python-ruby-version: {python: '3.12', ruby: '3.3', other: 'linker-bfd'}
           - compiler: clang
-            python-ruby-version: {python: '3.11', ruby: '3.1', other: 'linker-gold'}
+            python-ruby-version: {python: '3.12', ruby: '3.3', other: 'linker-gold'}
         include:
           - compiler: gcc
-            python-ruby-version: {python: '3.11', ruby: '3.1', other: 'sanitizers'}
+            python-ruby-version: {python: '3.12', ruby: '3.3', other: 'sanitizers'}
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-ruby-version.python }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-ruby-version.python }}
 
@@ -69,6 +72,10 @@  jobs:
 
         pip install flake8
 
+    - name: Install Python setuptools
+      if: matrix.python-ruby-version.python == '3.12'
+      run: pip install setuptools
+
     - name: Install Clang
       if: ${{ matrix.compiler == 'clang' }}
       run: sudo apt-get install -qqy clang