From b54abd819c983e0e588ffe2aac1d668d9c41182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 15 Aug 2022 23:11:38 +0200 Subject: [PATCH 1/2] Switch GitHub Actions Linux builds away from Ubuntu 18.04 because of deprecation by GitHub --- .github/workflows/master_build.yml | 2 +- .github/workflows/pr_build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 9a80ca4f05..9ec17bd91b 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -38,7 +38,7 @@ jobs: build_type: full - os: macOS-10.15 build_type: full - - os: ubuntu-18.04 + - os: ubuntu-20.04 build_type: full apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-github python3-distro fail-fast: false diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index ef3cb397ad..13731877fb 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -45,9 +45,9 @@ jobs: build_type: full - os: macOS-10.15 build_type: full - - os: ubuntu-18.04 + - os: ubuntu-20.04 build_type: full - apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-distro + apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion3 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-distro # Android builds are currently failing #- os: ubuntu-18.04 # build_type: android From fd20b94410f5c58189566fcf4c13c14edd5d2c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 15 Aug 2022 23:11:50 +0200 Subject: [PATCH 2/2] Do not upload stub Linux packages --- .github/workflows/master_build.yml | 1 + .github/workflows/pr_build.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 9ec17bd91b..be864bade9 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -232,6 +232,7 @@ jobs: run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log - name: Upload artifact + if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') # Automatic Linux packaging is not implemented shell: bash working-directory: ${{runner.workspace}}/build env: diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 13731877fb..eed870b3af 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -322,6 +322,7 @@ jobs: run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log - name: Upload Artifact + if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') # Automatic Linux packaging is not implemented shell: bash working-directory: ${{runner.workspace}}/build env: