Skip to content

Commit b54188d

Browse files
committed
ci: cleanup references to libglfw and libsdl2 (not used anymore)
1 parent 491fe49 commit b54188d

File tree

1 file changed

+12
-31
lines changed

1 file changed

+12
-31
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ jobs:
4949
- name: Install dependencies
5050
run: |
5151
sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
52-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
53-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
52+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
5453
## The following is needed for examples/wkhtmltopdf.v
5554
wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
5655
sudo apt-get install xfonts-75dpi xfonts-base
@@ -111,9 +110,8 @@ jobs:
111110
- name: Install dependencies
112111
run: |
113112
sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
114-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
113+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
115114
sudo apt-get install --quiet -y libgc-dev
116-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
117115
## The following is needed for examples/wkhtmltopdf.v
118116
wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
119117
sudo apt-get install xfonts-75dpi xfonts-base
@@ -167,7 +165,7 @@ jobs:
167165
- name: Install dependencies
168166
run: |
169167
sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
170-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
168+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
171169
sudo apt-get install --quiet -y xfonts-75dpi xfonts-base
172170
- name: Build v
173171
run: make
@@ -206,9 +204,8 @@ jobs:
206204
- name: Install C++ dependencies
207205
run: |
208206
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev
209-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
207+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
210208
sudo apt-get install --quiet -y valgrind g++-9
211-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
212209
- name: Build V
213210
run: make -j4
214211
- name: g++ version
@@ -293,8 +290,6 @@ jobs:
293290
##brew install libpq openssl freetype ### these are *already installed* on Catalina ...
294291
brew uninstall --ignore-dependencies libpq ## libpq is a dependency of PHP
295292
brew install postgresql
296-
brew install glfw
297-
## brew install sdl2 sdl2_ttf sdl2_mixer sdl2_image
298293
brew install mingw-w64
299294
export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/"
300295
- name: Build V
@@ -371,8 +366,7 @@ jobs:
371366
- name: Install dependencies
372367
run: |
373368
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
374-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
375-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
369+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
376370
- name: Build V
377371
run: make -j4 && ./v -cc gcc -cg -cflags -Werror -o v cmd/v
378372
- name: Valgrind v.c
@@ -445,9 +439,7 @@ jobs:
445439
../../vprod -backend x64 -o 1m 1m.v
446440
echo "Running it..."
447441
ls
448-
# - name: SDL examples
449-
# run: git clone --depth 1 https://github.com/vlang/sdl && cd sdl
450-
442+
451443
# ./1m
452444
#run: echo "TODO" #cd examples/x64 && ../../v -x64 hello_world.v && ./hello_world
453445
# - name: Coveralls GitHub Action
@@ -468,9 +460,8 @@ jobs:
468460
- name: Install dependencies
469461
run: |
470462
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
471-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
463+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
472464
sudo apt-get install clang
473-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
474465
- name: Build V
475466
run: make -j4 && ./v -cc clang -cg -cflags -Werror -o v cmd/v
476467
- name: Valgrind
@@ -546,9 +537,8 @@ jobs:
546537
- name: Install dependencies
547538
run: |
548539
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
549-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
540+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
550541
sudo apt-get install clang
551-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
552542
- name: Build V
553543
run: make -j4 && ./v -cg -cflags -Werror -o v cmd/v
554544
- name: Self tests (-fsanitize=undefined)
@@ -569,8 +559,7 @@ jobs:
569559
- name: Install dependencies
570560
run: |
571561
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
572-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
573-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
562+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
574563
- name: Build V
575564
run: make -j4 && ./v -cg -cflags -Werror -o v cmd/v
576565
- name: Self tests (-fsanitize=undefined)
@@ -591,9 +580,8 @@ jobs:
591580
- name: Install dependencies
592581
run: |
593582
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
594-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
583+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
595584
sudo apt-get install clang
596-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
597585
- name: Build V
598586
run: make -j4 && ./v -cg -cflags -Werror -o v cmd/v
599587
- name: Self tests (-fsanitize=address)
@@ -625,7 +613,6 @@ jobs:
625613
run: |
626614
.\v.exe setup-freetype
627615
.\.github\workflows\windows-install-sqlite.bat
628-
## .\.github\workflows\windows-install-sdl.bat
629616
- name: Self tests (-fsanitize=address)
630617
run: |
631618
.\v.exe -cflags -fsanitize=address test-self
@@ -643,9 +630,8 @@ jobs:
643630
- name: Install dependencies
644631
run: |
645632
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
646-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
633+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
647634
sudo apt-get install clang
648-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
649635
- name: Build V
650636
run: make -j4 && ./v -cg -cflags -Werror -o v cmd/v
651637
- name: Self tests (-fsanitize=address)
@@ -670,9 +656,8 @@ jobs:
670656
- name: Install dependencies
671657
run: |
672658
sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
673-
sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
659+
sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libasound2-dev
674660
sudo apt-get install clang
675-
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
676661
- name: Build V
677662
run: make -j4 && ./v -cc clang -cg -cflags -Werror -o v cmd/v
678663
- name: Self tests (-fsanitize=memory)
@@ -736,7 +721,6 @@ jobs:
736721
# - name: Install dependencies
737722
# run: |
738723
# sudo apt-get install --quiet -y musl musl-tools libssl-dev sqlite3 libsqlite3-dev valgrind
739-
# sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
740724
# - name: Build v
741725
# run: echo $VFLAGS && make -j4 && ./v -cg -o v cmd/v
742726
# # - name: Test v binaries
@@ -768,7 +752,6 @@ jobs:
768752
run: |
769753
.\v.exe setup-freetype
770754
.\.github\workflows\windows-install-sqlite.bat
771-
## .\.github\workflows\windows-install-sdl.bat
772755
- name: v doctor
773756
run: |
774757
./v doctor
@@ -811,7 +794,6 @@ jobs:
811794
run: |
812795
.\v.exe setup-freetype
813796
.\.github\workflows\windows-install-sqlite.bat
814-
## .\.github\workflows\windows-install-sdl.bat
815797
- name: v doctor
816798
run: |
817799
./v doctor
@@ -854,7 +836,6 @@ jobs:
854836
run: |
855837
.\v.exe setup-freetype
856838
.\.github\workflows\windows-install-sqlite.bat
857-
## .\.github\workflows\windows-install-sdl.bat
858839
- name: v doctor
859840
run: |
860841
./v doctor

0 commit comments

Comments
 (0)