diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2024-05-30 22:21:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-30 22:21:24 -0400 |
| commit | f32bccc5b93e4eccaef21bf62dff2e68034dd6c1 (patch) | |
| tree | 5c655ef263ce339f6fe6c134c2cb2989710e4bb6 /.github | |
| parent | c7aafb65fd54d56e22ad098bb2698573a0439a29 (diff) | |
ci(linux): install libzip without crypto, bump sdl from 2.28.5 -> 2.30.3 (#588)
* ci(linux): install libzip without crypto, bump sdl from 2.28.5 -> 2.30.3
* just install libzip with apt for otr gen
* copy the .so to a place linuxdeploy looks for it
* but do it in the right place
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/apt-deps.txt | 2 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 32 |
2 files changed, 18 insertions, 16 deletions
diff --git a/.github/workflows/apt-deps.txt b/.github/workflows/apt-deps.txt index 4d5fe5521..26e920d17 100644 --- a/.github/workflows/apt-deps.txt +++ b/.github/workflows/apt-deps.txt @@ -1 +1 @@ -libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build +libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f1d042351..b31a5bf66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,7 +114,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) + sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) libzip-dev zipcmp zipmerge ziptool - name: Cache build folders uses: actions/cache@v4 with: @@ -254,17 +254,17 @@ jobs: linux-build-${{ github.ref }} linux-build- path: | - SDL2-2.28.5 - SDL2_net-2.2.0 + SDL2-2.30.3 tinyxml2-10.0.0 + libzip-1.10.1 - name: Install latest SDL run: | export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - if [ ! -d "SDL2-2.28.5" ]; then - wget https://www.libsdl.org/release/SDL2-2.28.5.tar.gz - tar -xzf SDL2-2.28.5.tar.gz + if [ ! -d "SDL2-2.30.3" ]; then + wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz + tar -xzf SDL2-2.30.3.tar.gz fi - cd SDL2-2.28.5 + cd SDL2-2.30.3 ./configure --enable-hidapi-libusb make -j 10 sudo make install @@ -283,18 +283,20 @@ jobs: cmake .. make sudo make install - - name: Install latest SDL_net + - name: Install libzip without crypto run: | export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - if [ ! -d "SDL2_net-2.2.0" ]; then - wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz - tar -xzf SDL2_net-2.2.0.tar.gz + if [ ! -d "libzip-1.10.1" ]; then + wget https://github.com/nih-at/libzip/releases/download/v1.10.1/libzip-1.10.1.tar.gz + tar -xzf libzip-1.10.1.tar.gz fi - cd SDL2_net-2.2.0 - ./configure - make -j 10 + cd libzip-1.10.1 + mkdir -p build + cd build + cmake .. -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF + make sudo make install - sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/ + sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/ - name: Download 2ship.o2r uses: actions/download-artifact@v4 with: |