Skip to content

Commit 4f717c4

Browse files
Attempt to fix CI for vendored SFML
1 parent 294fd67 commit 4f717c4

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,12 @@ jobs:
2323
run: |
2424
sudo apt-get update
2525
sudo apt-get install libpthread-stubs0-dev libgl1-mesa-dev libx11-dev libx11-xcb-dev libxcb-image0-dev libxrandr-dev libxcb-randr0-dev libudev-dev libfreetype6-dev libglew-dev libjpeg8-dev libgpgme11-dev libsndfile1-dev libopenal-dev libjpeg62 libxcursor-dev cmake libclang-dev clang
26-
- name: Set up SFML
27-
run: |
28-
set -e
29-
mkdir sfml_install
30-
# TODO: Maybe investigate why the certificate checks for the SFML sources fail
31-
wget https://www.sfml-dev.org/files/SFML-2.6.0-sources.zip --no-check-certificate
32-
unzip -q SFML-2.6.0-sources.zip
33-
pushd SFML-2.6.0 && mkdir build && cd build && cmake .. && make
34-
make DESTDIR=$GITHUB_WORKSPACE/sfml_install install
35-
popd
3626
- name: Build
3727
run: |
38-
export SFML_INCLUDE_DIR=$GITHUB_WORKSPACE/sfml_install/usr/local/include
39-
export SFML_LIBS_DIR=$GITHUB_WORKSPACE/sfml_install/usr/local/lib
28+
git submodule update --init
4029
cargo build --verbose
4130
- name: Run tests
4231
run: |
43-
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/sfml_install/usr/local/lib
44-
export SFML_INCLUDE_DIR=$GITHUB_WORKSPACE/sfml_install/usr/local/include
45-
export SFML_LIBS_DIR=$GITHUB_WORKSPACE/sfml_install/usr/local/lib
4632
cargo test --features ci-headless --verbose
4733
# Also test non-default feature combinations
4834
cargo test --no-default-features --features=ci-headless --verbose

0 commit comments

Comments
 (0)