Skip to content

Commit 12ec052

Browse files
committed
CI: ubuntu 24.04 => don't upgrade pip with pi itself, but use apt upgrade
1 parent e069cb7 commit 12ec052

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
# NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
2929
- name: Setup Meson
3030
run: |
31-
python -m pip install --upgrade pip
3231
pip install meson --break-system-packages
3332
3433
- name: Setup ninja
3534
run: |
3635
sudo apt-get update
36+
sudo apt-get upgrade -y
3737
sudo apt-get install ninja-build jq
3838
3939
- name: Setup JDK

.github/workflows/cpp-linter.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
# NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
1818
- name: Setup Meson
1919
run: |
20-
python -m pip install --upgrade pip
2120
pip install meson --break-system-packages
2221
2322
- name: Setup Clang
@@ -29,7 +28,9 @@ jobs:
2928
- name: Prepare compile_commands.json
3029
run: |
3130
sudo apt-get update
31+
sudo apt-get upgrade -y
3232
sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* -y
33+
3334
meson setup build -Dbuildtype=release -Dclang_libcpp=disabled -Dtests=true
3435
meson compile -C build git_version.hpp
3536

.github/workflows/installer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
- name: Setup meson
4242
if: matrix.config.os != 'macos'
4343
run: |
44-
python -m pip install --upgrade pip
4544
pip install meson
4645
4746
- name: Configure

.github/workflows/meson.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ jobs:
165165
- name: Setup meson
166166
if: matrix.config.os != 'macos'
167167
run: |
168-
python -m pip install --upgrade pip
169168
pip install meson --break-system-packages
170169
171170
- name: Install dependencies (Linux)
172171
if: matrix.config.os == 'ubuntu'
173172
run: |
174173
sudo apt-get update
174+
sudo apt-get upgrade -y
175175
sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* -y
176176
177177
- name: Install dependencies (MacOS)

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
# NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
2828
- name: Setup meson
2929
run: |
30-
python -m pip install --upgrade pip
3130
pip install meson --break-system-packages
3231
3332
- name: Install dependencies
3433
run: |
3534
sudo apt-get update
35+
sudo apt-get upgrade -y
3636
sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* -y
3737
pip install gcovr
3838

0 commit comments

Comments
 (0)