A few more CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>

.github/workflows/build.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   linux-arm64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -22,23 +22,19 @@ jobs:
         run: |
           sudo dpkg --add-architecture arm64
           sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
-          echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-arm64.list
-          echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
-          echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
+          echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-arm64.list
+          echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
+          echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
           sudo apt-get update -qq
           sudo apt-get install -yq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static xvfb
           # extra for vcv deps
           sudo apt-get install -yq libxi-dev:arm64 libxinerama-dev:arm64
-          # fix broken Ubuntu packages missing pkg-config file in multi-arch package
-          sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev
-          sudo ln -s /usr/lib/aarch64-linux-gnu/liblo.so.7 /usr/lib/aarch64-linux-gnu/liblo.so
-          sudo cp /usr/lib/x86_64-linux-gnu/pkgconfig/liblo.pc /usr/lib/aarch64-linux-gnu/pkgconfig/liblo.pc
-          sudo sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" /usr/lib/aarch64-linux-gnu/pkgconfig/liblo.pc
       - name: Build linux arm64 cross-compiled
         env:
           CC: aarch64-linux-gnu-gcc
           CXX: aarch64-linux-gnu-g++
           LDFLAGS: -static-libgcc -static-libstdc++
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
           make features
           xvfb-run make WITH_LTO=true -j $(nproc)
@@ -55,7 +51,7 @@ jobs:
             *.tar.gz
 
   linux-armhf:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -64,23 +60,19 @@ jobs:
         run: |
           sudo dpkg --add-architecture armhf
           sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
-          echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-armhf.list
-          echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
-          echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
+          echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-armhf.list
+          echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
+          echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
           sudo apt-get update -qq
           sudo apt-get install -yq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static xvfb
           # extra for vcv deps
           sudo apt-get install -yq libxi-dev:armhf libxinerama-dev:armhf
-          # fix broken Ubuntu packages missing pkg-config file in multi-arch package
-          sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev
-          sudo ln -s /usr/lib/arm-linux-gnueabihf/liblo.so.7 /usr/lib/arm-linux-gnueabihf/liblo.so
-          sudo cp /usr/lib/x86_64-linux-gnu/pkgconfig/liblo.pc /usr/lib/arm-linux-gnueabihf/pkgconfig/liblo.pc
-          sudo sed -i "s/x86_64-linux-gnu/arm-linux-gnueabihf/" /usr/lib/arm-linux-gnueabihf/pkgconfig/liblo.pc
       - name: Build linux armhf cross-compiled
         env:
           CC: arm-linux-gnueabihf-gcc
           CXX: arm-linux-gnueabihf-g++
           LDFLAGS: -static-libgcc -static-libstdc++
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
           make features
           xvfb-run make WITH_LTO=true -j $(nproc)
@@ -97,7 +89,7 @@ jobs:
             *.tar.gz
 
   linux-x86:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -117,6 +109,7 @@ jobs:
           CXXFLAGS: -m32
           LDFLAGS: -m32 -static-libgcc -static-libstdc++
           PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
           make features
           xvfb-run make WITH_LTO=true -j $(nproc)
@@ -147,6 +140,7 @@ jobs:
       - name: Build linux x86_64
         env:
           LDFLAGS: -static-libgcc -static-libstdc++
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
           make features
           xvfb-run make WITH_LTO=true -j $(nproc)
@@ -177,6 +171,7 @@ jobs:
       - name: Build linux x86_64 (debug)
         env:
           LDFLAGS: -static-libgcc -static-libstdc++
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
           make features
           xvfb-run make DEBUG=true -j $(nproc)
@@ -209,7 +204,7 @@ jobs:
           LDFLAGS: -arch x86_64 -arch arm64 -mmacosx-version-min=10.12
         run: |
           make features
-          make NOOPT=true -j $(sysctl -n hw.logicalcpu)
+          make NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu)
           ./dpf/utils/package-osx-bundles.sh
       - name: Set sha8
         id: slug
@@ -237,6 +232,7 @@ jobs:
           CXX: i686-w64-mingw32-g++
           EXE_WRAPPER: wine
           PKG_CONFIG: "false"
+          LIBGL_ALWAYS_SOFTWARE: "true"
           WINEARCH: "win32"
           WINEDEBUG: "-all"
           WINEDLLOVERRIDES: "mscoree,mshtml="
@@ -272,6 +268,7 @@ jobs:
           CXX: x86_64-w64-mingw32-g++
           EXE_WRAPPER: wine
           PKG_CONFIG: "false"
+          LIBGL_ALWAYS_SOFTWARE: "true"
           WINEARCH: "win64"
           WINEDEBUG: "-all"
           WINEDLLOVERRIDES: "mscoree,mshtml="
@@ -314,6 +311,7 @@ jobs:
           CFLAGS: -g
           CXXFLAGS: -g -DDPF_ABORT_ON_ERROR
           LDFLAGS: -static-libgcc -static-libstdc++
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
           make features
           xvfb-run make NOOPT=true SKIP_STRIPPING=true -j $(nproc)
@@ -326,6 +324,8 @@ jobs:
               /usr/lib/lv2/kx-programs.lv2/*.ttl \
               ./bin/*.lv2/*.ttl
       - name: Validate LV2 metadata and binaries
+        env:
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
           export LV2_PATH=/tmp/lv2-path
           mkdir ${LV2_PATH}
@@ -334,6 +334,8 @@ jobs:
               ${LV2_PATH}
           xvfb-run lv2lint -s lv2_generate_ttl -l ld-linux-x86-64.so.2 -M nopack $(lv2ls)
       - name: Test LV2 plugin
+        env:
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
             export LV2_PATH=/tmp/lv2-path
             for p in $(lv2ls); do \
@@ -346,6 +348,8 @@ jobs:
                     /usr/lib/carla/carla-bridge-native lv2 "" ${p} 1>/dev/null; \
             done
       - name: Test VST2 plugin
+        env:
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
             for p in $(ls bin/ | grep vst.so); do \
                 env CARLA_BRIDGE_DUMMY=1 CARLA_BRIDGE_TESTING=native \
@@ -357,6 +361,8 @@ jobs:
                     /usr/lib/carla/carla-bridge-native vst2 ./bin/${p} "" 1>/dev/null; \
             done
       - name: Test VST3 plugin
+        env:
+          LIBGL_ALWAYS_SOFTWARE: "true"
         run: |
             for p in $(ls bin/ | grep vst3); do \
                 env CARLA_BRIDGE_DUMMY=1 CARLA_BRIDGE_TESTING=native \