Skip to content

Commit ceda7d8

Browse files
committed
update workflows
1 parent f1de24b commit ceda7d8

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
build-linux-i386:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88

99
steps:
1010
- uses: actions/checkout@v2
@@ -13,7 +13,7 @@ jobs:
1313
scripts/build-ubuntu-i386.sh
1414
1515
build-linux-amd64:
16-
runs-on: ubuntu-18.04
16+
runs-on: ubuntu-20.04
1717

1818
steps:
1919
- uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
2222
scripts/build-ubuntu-amd64.sh
2323
2424
build-android-armv7a:
25-
runs-on: ubuntu-18.04
25+
runs-on: ubuntu-20.04
2626

2727
steps:
2828
- uses: actions/checkout@v2
@@ -75,7 +75,7 @@ jobs:
7575
./waf.bat build
7676
7777
build-dedicated-linux-i386:
78-
runs-on: ubuntu-18.04
78+
runs-on: ubuntu-20.04
7979

8080
steps:
8181
- uses: actions/checkout@v2
@@ -84,7 +84,7 @@ jobs:
8484
scripts/build-ubuntu-i386.sh -d
8585
8686
build-dedicated-linux-amd64:
87-
runs-on: ubuntu-18.04
87+
runs-on: ubuntu-20.04
8888

8989
steps:
9090
- uses: actions/checkout@v2

.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
tests-linux-i386:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88

99
steps:
1010
- uses: actions/checkout@v2
@@ -13,7 +13,7 @@ jobs:
1313
scripts/tests-ubuntu-i386.sh
1414
1515
tests-linux-amd64:
16-
runs-on: ubuntu-18.04
16+
runs-on: ubuntu-20.04
1717

1818
steps:
1919
- uses: actions/checkout@v2

scripts/build-ubuntu-i386.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
git submodule init && git submodule update
44
sudo dpkg --add-architecture i386
55
sudo apt-get update
6-
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
6+
sudo apt-get install -y aptitude
7+
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
78

89
PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns $* &&
910
./waf build

scripts/tests-ubuntu-i386.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
#!/bin/sh
1+
install#!/bin/sh
22

33
git submodule init && git submodule update
44
sudo dpkg --add-architecture i386
55
sudo apt-get update
6-
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
6+
sudo apt-get install -y aptitude
7+
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
78

89
PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --disable-warns --tests --prefix=out/ $* &&
910
./waf install &&

0 commit comments

Comments
 (0)