Skip to content

Commit 58c3d78

Browse files
authored
Merge pull request unbit#2719 from xrmx/fix-ci-2204
ci: run everything on ubuntu 22.04
2 parents f2da9fa + abc456a commit 58c3d78

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

.github/workflows/compile-test.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,12 @@ jobs:
1111
strategy:
1212
matrix:
1313
libpcre: ["libpcre3-dev", "libpcre2-dev"]
14-
os: ["ubuntu-20.04", "ubuntu-22.04"]
14+
os: ["ubuntu-22.04"]
1515
cc: [gcc, clang]
1616
include:
17-
- os: ubuntu-20.04
18-
php: "php7.4"
19-
php-config: "php-config7.4"
2017
- os: ubuntu-22.04
2118
php: "php8.1"
2219
php-config: "php-config8.1"
23-
exclude:
24-
- os: ubuntu-20.04
25-
cc: "clang"
2620

2721
runs-on: ${{ matrix.os }}
2822

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ on:
99
jobs:
1010

1111
unittest:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Install dependencies
1515
run: |
1616
sudo apt update -qq
1717
sudo apt install --no-install-recommends -qqyf \
18-
libpcre2-dev libjansson-dev libcap2-dev \
18+
libpcre3-dev libjansson-dev libcap2-dev \
1919
check
2020
- uses: actions/checkout@v4
2121
- name: Run unit tests
@@ -39,10 +39,10 @@ jobs:
3939
run: make all tests
4040

4141
python:
42-
runs-on: ubuntu-20.04
42+
runs-on: ubuntu-22.04
4343
strategy:
4444
matrix:
45-
python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
45+
python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
4646
test-suite: [python, deadlocks]
4747
steps:
4848
- name: Add deadnakes ppa
@@ -54,7 +54,7 @@ jobs:
5454
libpcre2-dev libjansson-dev libcap2-dev \
5555
curl
5656
- name: Install distutils
57-
if: contains(fromJson('["3.6","3.7","3.8","3.9","3.10","3.11"]'), matrix.python-version)
57+
if: contains(fromJson('["3.7","3.8","3.9","3.10","3.11"]'), matrix.python-version)
5858
run: |
5959
sudo apt install --no-install-recommends -qqyf python${{ matrix.python-version }}-distutils \
6060
- uses: actions/checkout@v4
@@ -73,16 +73,16 @@ jobs:
7373
./tests/gh-${{ matrix.test-suite }}.sh ${PYTHON_VERSION}
7474
7575
rack:
76-
runs-on: ubuntu-20.04
76+
runs-on: ubuntu-22.04
7777
strategy:
7878
matrix:
79-
rack-version: ["270"]
79+
rack-version: ["300"]
8080
steps:
8181
- name: Install dependencies
8282
run: |
8383
sudo apt update -qq
8484
sudo apt install --no-install-recommends -qqyf python3-dev \
85-
libpcre2-dev libjansson-dev libcap2-dev ruby2.7-dev \
85+
libpcre2-dev libjansson-dev libcap2-dev ruby3.0-dev \
8686
curl
8787
- uses: actions/checkout@v4
8888
- name: Build uWSGI binary

0 commit comments

Comments
 (0)