From ceda7d8ad038b20438af2922a2503d04f11d7b5b Mon Sep 17 00:00:00 2001 From: nillerusr Date: Thu, 6 Apr 2023 01:27:17 +0300 Subject: [PATCH] update workflows --- .github/workflows/build.yml | 10 +++++----- .github/workflows/tests.yml | 4 ++-- scripts/build-ubuntu-i386.sh | 3 ++- scripts/tests-ubuntu-i386.sh | 5 +++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 779ebc77..7738f3bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build-linux-i386: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 @@ -13,7 +13,7 @@ jobs: scripts/build-ubuntu-i386.sh build-linux-amd64: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 @@ -22,7 +22,7 @@ jobs: scripts/build-ubuntu-amd64.sh build-android-armv7a: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 @@ -75,7 +75,7 @@ jobs: ./waf.bat build build-dedicated-linux-i386: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 @@ -84,7 +84,7 @@ jobs: scripts/build-ubuntu-i386.sh -d build-dedicated-linux-amd64: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4974855e..c21d0a55 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: tests-linux-i386: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 @@ -13,7 +13,7 @@ jobs: scripts/tests-ubuntu-i386.sh tests-linux-amd64: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/scripts/build-ubuntu-i386.sh b/scripts/build-ubuntu-i386.sh index feee15b0..c9609cae 100755 --- a/scripts/build-ubuntu-i386.sh +++ b/scripts/build-ubuntu-i386.sh @@ -3,7 +3,8 @@ git submodule init && git submodule update sudo dpkg --add-architecture i386 sudo apt-get update -sudo apt-get install -f -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386 +sudo apt-get install -y aptitude +sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns $* && ./waf build diff --git a/scripts/tests-ubuntu-i386.sh b/scripts/tests-ubuntu-i386.sh index b9a4a427..ee451ee4 100755 --- a/scripts/tests-ubuntu-i386.sh +++ b/scripts/tests-ubuntu-i386.sh @@ -1,9 +1,10 @@ -#!/bin/sh +install#!/bin/sh git submodule init && git submodule update sudo dpkg --add-architecture i386 sudo apt-get update -sudo apt-get install -f -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386 +sudo apt-get install -y aptitude +sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --disable-warns --tests --prefix=out/ $* && ./waf install &&