Skip to content

Commit

Permalink
ci: fix ALSA and other errors on ubuntu-latest, bump checkout ver…
Browse files Browse the repository at this point in the history
…sion, add SDL v2.30.0 checks (#10)
  • Loading branch information
larpon authored Mar 2, 2024
1 parent aba327f commit 2771b05
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 22 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
VFLAGS: -cc tcc
steps:
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

- name: Build local v
run: make -j4 && sudo ./v symlink

- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
make install
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

Expand All @@ -94,7 +94,7 @@ jobs:
run: v install sdl

- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
make install
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

Expand All @@ -164,7 +164,7 @@ jobs:
run: v install sdl

- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
make install
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

Expand All @@ -228,7 +228,7 @@ jobs:
run: v install sdl

- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
sdl-version: [2.0.9, 2.0.10, 2.0.12, 2.0.14, 2.0.16, 2.0.18, 2.0.20, 2.0.22, 2.24.0, 2.26.0, 2.28.0]
sdl-version: [2.0.9, 2.0.10, 2.0.12, 2.0.14, 2.0.16, 2.0.18, 2.0.20, 2.0.22, 2.24.0, 2.26.0, 2.28.0, 2.30.0]
timeout-minutes: 20
env:
VFLAGS: -cc tcc -no-retry-compilation
Expand All @@ -283,15 +283,15 @@ jobs:
sudo make install
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

- name: Build local v
run: make && sudo ./v symlink

- name: Checkout SDL ${{ matrix.sdl-version }}
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ matrix.sdl-version }}
repository: vlang/sdl
Expand All @@ -303,7 +303,7 @@ jobs:
mv sdl ~/.vmodules
- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
VFLAGS: -cc tcc
steps:
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

- name: Build local v
run: make -j4 && sudo ./v symlink

- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

Expand All @@ -40,20 +40,20 @@ jobs:
MOPTIONS: --relative-paths --exclude /tests/
steps:
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

- name: Build local v
run: make -j4 && sudo ./v symlink

- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

- name: Checkout previous shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: larpon/shy
ref: master
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/ci_visual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 20
env:
VFLAGS: -cc tcc -no-retry-compilation
VFLAGS: -cc tcc -no-retry-compilation -d sdl_memory_no_gc
CFLAGS: -DMA_ENABLE_ONLY_SPECIFIC_BACKENDS -DMA_ENABLE_NULL
VTMP: /tmp
DISPLAY: :99
LIBGL_ALWAYS_SOFTWARE: true
SDL2_VERSION: 2.28.2
SHY_CI_VISUAL_TEST: 1

steps:
- name: Checkout V
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: vlang/v

Expand All @@ -45,8 +47,7 @@ jobs:
# openimageio-tools : idiff
# libgl1-mesa-dri : For headless rendering / software DRI driver (LIBGL_ALWAYS_SOFTWARE=true)
# freeglut3-dev : Fixes graphic apps compilation with tcc
# alsa-utils : Fixes `ALSA lib confmisc.c:855:(parse_card) cannot find card '0'` errors on newer ubuntu-images
sudo apt-get install imagemagick openimageio-tools freeglut3-dev libgl1-mesa-dri xvfb alsa-utils
sudo apt-get install imagemagick openimageio-tools freeglut3-dev libgl1-mesa-dri xvfb
# Get imgur upload script
wget https://raw.githubusercontent.com/tremby/imgur.sh/c98345d/imgur.sh
Expand All @@ -70,7 +71,7 @@ jobs:
v run ~/.vmodules/sdl/setup.vsh
- name: Checkout shy
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: shy

Expand Down

0 comments on commit 2771b05

Please sign in to comment.