diff --git a/.ci/build-cs b/.ci/build-cs index 00aa20b..e3f0136 100755 --- a/.ci/build-cs +++ b/.ci/build-cs @@ -12,7 +12,7 @@ current_triplet=`$CC -dumpmachine` if [ "$CC" = "clang" ]; then export CXX="clang++" else - export CXX="g++" + export CXX="g++-10" fi if [ "$TARGET" != "darwin" -a "$CC" != "clang" -a "$expected_triplet" != "$current_triplet" ]; then diff --git a/.ci/build-cs-windows b/.ci/build-cs-windows index 1db7d49..6251ce2 100755 --- a/.ci/build-cs-windows +++ b/.ci/build-cs-windows @@ -12,7 +12,7 @@ if [ -n "$BUILDTYPE" ]; then fi mkdir -p build -cd build- +cd build cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat' amd64 '&&' \ meson .. ${args} '&&' \ diff --git a/.ci/install-env b/.ci/install-env index df3547a..b27c5f2 100755 --- a/.ci/install-env +++ b/.ci/install-env @@ -62,7 +62,9 @@ if [ "$(uname -s)" != "Linux" ]; then exit 0 fi -current_triplet=`gcc -dumpmachine` +sudo apt-get install gcc-10 g++-10 || exit 1 + +current_triplet=`gcc-10 -dumpmachine` if [ -z "$current_triplet" ]; then echo "ERROR: Native compiler not present!" @@ -83,6 +85,6 @@ else extra_packages="qemu-user" fi -sudo apt-get install gcc-${gcc_suffix} g++-${gcc_suffix} ${extra_packages} || exit 1 +sudo apt-get install gcc-10-${gcc_suffix} g++-10-${gcc_suffix} ${extra_packages} || exit 1 exit $? diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fbf952c..196f18c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,7 +9,6 @@ jobs: env: TARGET: '${{ matrix.config.target }}' - LUA_VERSIONS: '5.4.2 5.3.6 5.2.4 5.1.5' CC: '${{ matrix.config.cc }}' BUILDTYPE: '${{ matrix.config.buildtype }}' @@ -17,26 +16,26 @@ jobs: matrix: config: # x86_64: test gcc, clang, + release mode to catch assert bugs - - { target: x86_64-linux-gnu, cc: gcc, buildtype: debugoptimized } - - { target: x86_64-linux-gnu, cc: gcc, buildtype: release } + - { target: x86_64-linux-gnu, cc: gcc-10, buildtype: debugoptimized } + - { target: x86_64-linux-gnu, cc: gcc-10, buildtype: release } - { target: x86_64-linux-gnu, cc: clang, buildtype: debugoptimized } # 32-bit x86 - - { target: i686-linux-gnu, cc: gcc, buildtype: debugoptimized } + - { target: i686-linux-gnu, cc: gcc-10, buildtype: debugoptimized } # all powerpc - - { target: powerpc64le-linux-gnu, cc: gcc, buildtype: debugoptimized } - - { target: powerpc64-linux-gnu, cc: gcc, buildtype: debugoptimized } - - { target: powerpc-linux-gnu, cc: gcc, buildtype: debugoptimized } + - { target: powerpc64le-linux-gnu, cc: gcc-10, buildtype: debugoptimized } + - { target: powerpc64-linux-gnu, cc: gcc-10, buildtype: debugoptimized } + - { target: powerpc-linux-gnu, cc: gcc-10, buildtype: debugoptimized } # aarch64 and arm - - { target: aarch64-linux-gnu, cc: gcc, buildtype: debugoptimized } - - { target: arm-linux-gnueabi, cc: gcc, buildtype: debugoptimized } + - { target: aarch64-linux-gnu, cc: gcc-10, buildtype: debugoptimized } + - { target: arm-linux-gnueabi, cc: gcc-10, buildtype: debugoptimized } # riscv64 and s390x - - { target: riscv64-linux-gnu, cc: gcc, buildtype: debugoptimized } - - { target: s390x-linux-gnu, cc: gcc, buildtype: debugoptimized } + - { target: riscv64-linux-gnu, cc: gcc-10, buildtype: debugoptimized } + - { target: s390x-linux-gnu, cc: gcc-10, buildtype: debugoptimized } # mips, m68k - - { target: mips-linux-gnu, cc: gcc, buildtype: debugoptimized } - - { target: m68k-linux-gnu, cc: gcc, buildtype: debug } + - { target: mips-linux-gnu, cc: gcc-10, buildtype: debugoptimized } + - { target: m68k-linux-gnu, cc: gcc-10, buildtype: debug } # x86_64 windows cross, release mode - - { target: x86_64-w64-mingw32, cc: gcc, buildtype: release } + - { target: x86_64-w64-mingw32, cc: gcc-10, buildtype: release } steps: - name: Checkout