mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-15 00:05:06 +00:00
ci: Upgrade Ubuntu to 20.04 and don't use remote LLVM
Ubuntu 20.04 has officially replaced 19.10 as the latest version, and is stable enough that people can move to it. The script doesn't change much for that. However we do remove the needless extra builds here and revert to the system installed clang version, which thanks to other pull requests now works fine. For Ubuntu 18.04 that is clang-8, while for Ubuntu 20.04 it is clang-9.
This commit is contained in:
parent
ad64314b37
commit
37e78cdcfa
1 changed files with 16 additions and 30 deletions
46
.github/workflows/main.yml
vendored
46
.github/workflows/main.yml
vendored
|
@ -70,49 +70,39 @@ jobs:
|
||||||
name: "Ubuntu 64-bit"
|
name: "Ubuntu 64-bit"
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
ubuntu: [ bionic ]
|
ubuntu: [ bionic, focal ]
|
||||||
compiler: [ gcc, clang ]
|
compiler: [ gcc, clang ]
|
||||||
compiler-version: [ 8, 9, 10 ]
|
|
||||||
exclude:
|
|
||||||
- ubuntu: bionic
|
|
||||||
compiler: gcc
|
|
||||||
compiler-version: 10
|
|
||||||
- ubuntu: bionic
|
|
||||||
compiler: clang
|
|
||||||
compiler-version: 8
|
|
||||||
include:
|
include:
|
||||||
- ubuntu: bionic
|
- ubuntu: bionic
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
compiler-version: 8
|
|
||||||
compiler-cxx: g++
|
compiler-cxx: g++
|
||||||
runner: ubuntu-18.04
|
runner: ubuntu-18.04
|
||||||
packages: gcc-8 g++8
|
packages: gcc-8 g++8
|
||||||
extra_command: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
|
extra_command: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
|
||||||
id: ubuntu1804-gcc8
|
id: ubuntu-18.04
|
||||||
- ubuntu: bionic
|
- ubuntu: bionic
|
||||||
|
compiler: clang
|
||||||
|
compiler-cxx: clang
|
||||||
|
compiler-version: 8
|
||||||
|
runner: ubuntu-18.04
|
||||||
|
packages: clang-8
|
||||||
|
extra_command: ""
|
||||||
|
id: ubuntu-18.04-clang
|
||||||
|
- ubuntu: focal
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
compiler-version: 9
|
|
||||||
compiler-cxx: g++
|
compiler-cxx: g++
|
||||||
runner: ubuntu-latest
|
runner: ubuntu-20.04
|
||||||
packages: gcc-9 g++9
|
packages: gcc-9 g++9
|
||||||
extra_command: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9
|
extra_command: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9
|
||||||
id: ubuntu1910-gcc9
|
id: ubuntu-20.04
|
||||||
- ubuntu: bionic
|
- ubuntu: focal
|
||||||
compiler: clang
|
compiler: clang
|
||||||
|
compiler-cxx: clang
|
||||||
compiler-version: 9
|
compiler-version: 9
|
||||||
compiler-cxx: clang++
|
runner: ubuntu-20.04
|
||||||
runner: ubuntu-18.04
|
|
||||||
packages: clang-9
|
packages: clang-9
|
||||||
extra_command: ""
|
extra_command: ""
|
||||||
id: ubuntu1804-clang9
|
id: ubuntu-20.04-clang
|
||||||
- ubuntu: bionic
|
|
||||||
compiler: clang
|
|
||||||
compiler-version: 10
|
|
||||||
compiler-cxx: clang++
|
|
||||||
runner: ubuntu-latest
|
|
||||||
packages: clang-10
|
|
||||||
extra_command: ""
|
|
||||||
id: ubuntu1910-clang10
|
|
||||||
runs-on: ${{ matrix.runner }}
|
runs-on: ${{ matrix.runner }}
|
||||||
env:
|
env:
|
||||||
CMAKE_GENERATOR: "Ninja"
|
CMAKE_GENERATOR: "Ninja"
|
||||||
|
@ -127,10 +117,6 @@ jobs:
|
||||||
- name: "Prerequisites: Apt-Get"
|
- name: "Prerequisites: Apt-Get"
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ matrix.compiler }}" == "clang" ]; then
|
|
||||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
|
||||||
sudo add-apt-repository "deb http://apt.llvm.org/${{ matrix.ubuntu }}/ llvm-toolchain-${{ matrix.ubuntu }}-${{ matrix.compiler-version }} main"
|
|
||||||
fi
|
|
||||||
sudo apt-get -qq update
|
sudo apt-get -qq update
|
||||||
sudo apt-get purge libjpeg9-dev:amd64 libjpeg8-dev:amd64 libjpeg-turbo8-dev:amd64
|
sudo apt-get purge libjpeg9-dev:amd64 libjpeg8-dev:amd64 libjpeg-turbo8-dev:amd64
|
||||||
sudo apt-get install \
|
sudo apt-get install \
|
||||||
|
|
Loading…
Reference in a new issue