commit c9558311f8237292652ef62f39bee14ef61bb1fa
Author: Roman Fomin <rfomin@gmail.com>
AuthorDate: Fri Aug 1 17:24:52 2025 +0700
Commit: GitHub <noreply@github.com>
CommitDate: Fri Aug 1 12:24:52 2025 +0200
Update GitHub workflow (#1754)
The MSYS2 package "*-python3-yaml" was renamed "*-python-yaml." To simplify maintenance, use the GitHub action "setup-python" for all configurations.
---
.github/workflows/main.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 113c3fc6..ab46d4fa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,7 +68,6 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install \
- python3-yaml \
libsdl2-dev \
libsdl2-mixer-dev \
libsdl2-net-dev \
@@ -86,11 +85,7 @@ jobs:
sdl2_net \
libpng \
libsamplerate \
- python3 \
fluid-synth
- # Since we're running CI inside a VM it doesn't really
- # matter if we're "breaking" anything:
- pip3 install --break-system-packages pyyaml
- name: Install dependencies (MSYS2)
if: runner.os == 'Windows'
@@ -102,6 +97,7 @@ jobs:
install: >-
autotools
zip
+ ${{ matrix.config.msys-env }}-python-pip
${{ matrix.config.msys-env }}-gcc
${{ matrix.config.msys-env }}-SDL2
${{ matrix.config.msys-env }}-SDL2_mixer
@@ -109,7 +105,6 @@ jobs:
${{ matrix.config.msys-env }}-libpng
${{ matrix.config.msys-env }}-libsamplerate
${{ matrix.config.msys-env }}-fluidsynth
- ${{ matrix.config.msys-env }}-python3-yaml
- uses: actions/checkout@v4
with:
@@ -124,8 +119,13 @@ jobs:
- name: Build
run: make -j4
+ - uses: actions/setup-python@v5
+ with:
+ python-version: '3.x'
+
- name: Test
run: |
+ pip install pyyaml
PREFIX=`sed -n '/PROGRAM_PREFIX/p' ${PWD}/config.h | cut -d '"' -f 2`
make -j4 -C quickcheck check SOURCE_PORT=$PWD/src/${PREFIX}doom