mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-17 22:02:19 -05:00
Code Issues Projects Releases Wiki Activity

ci(linux): install libzip without crypto, bump sdl from 2.28.5 -> 2.30.3 (#4708)

Browse Source
This commit is contained in:
Archez 2024-12-17 16:58:42 -05:00 committed by GitHub
parent 5d978c11c4
commit 4bf608a051
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/apt-deps.txt vendored
View File

@ -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

54
.github/workflows/generate-builds.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update 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 - name: Cache build folders
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
@ -32,15 +32,15 @@ jobs:
${{ runner.os }}-otr-build- ${{ runner.os }}-otr-build-
path: | path: |
build-cmake build-cmake
SDL2-2.28.5 SDL2-2.30.3
- name: Install latest SDL - name: Install latest SDL
run: | run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
if [ ! -d "SDL2-2.28.5" ]; then if [ ! -d "SDL2-2.30.3" ]; then
wget https://www.libsdl.org/release/SDL2-2.28.5.tar.gz wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz
tar -xzf SDL2-2.28.5.tar.gz tar -xzf SDL2-2.30.3.tar.gz
fi fi
cd SDL2-2.28.5 cd SDL2-2.30.3
./configure --enable-hidapi-libusb ./configure --enable-hidapi-libusb
make -j 10 make -j 10
sudo make install sudo make install
@ -157,20 +157,34 @@ jobs:
linux-build-${{ github.ref }} linux-build-${{ github.ref }}
linux-build- linux-build-
path: | path: |
SDL2-2.28.5 SDL2-2.30.3
SDL2_net-2.2.0 SDL2_net-2.2.0
tinyxml2-10.0.0
libzip-1.10.1
- name: Install latest SDL - name: Install latest SDL
run: | run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
if [ ! -d "SDL2-2.28.5" ]; then if [ ! -d "SDL2-2.30.3" ]; then
wget https://www.libsdl.org/release/SDL2-2.28.5.tar.gz wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz
tar -xzf SDL2-2.28.5.tar.gz tar -xzf SDL2-2.30.3.tar.gz
fi fi
cd SDL2-2.28.5 cd SDL2-2.30.3
./configure --enable-hidapi-libusb ./configure --enable-hidapi-libusb
make -j 10 make -j 10
sudo make install sudo make install
sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/ sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
- name: Install latest SDL_net
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
fi
cd SDL2_net-2.2.0
./configure
make -j 10
sudo make install
sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
- name: Install latest tinyxml2 - name: Install latest tinyxml2
run: | run: |
sudo apt-get remove libtinyxml2-dev sudo apt-get remove libtinyxml2-dev
@ -185,18 +199,20 @@ jobs:
cmake .. cmake ..
make make
sudo make install sudo make install
- name: Install latest SDL_net - name: Install libzip without crypto
run: | run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
if [ ! -d "SDL2_net-2.2.0" ]; then if [ ! -d "libzip-1.10.1" ]; then
wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz wget https://github.com/nih-at/libzip/releases/download/v1.10.1/libzip-1.10.1.tar.gz
tar -xzf SDL2_net-2.2.0.tar.gz tar -xzf libzip-1.10.1.tar.gz
fi fi
cd SDL2_net-2.2.0 cd libzip-1.10.1
./configure mkdir -p build
make -j 10 cd build
cmake .. -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF
make
sudo make install 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 soh.otr - name: Download soh.otr
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with: