From 1a01ba37f065e3e6f995bb56cdbb90bdc04fb2e6 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 7 May 2021 15:07:55 +0200 Subject: [PATCH 1/2] .github/workflows/coverage.yml: Fix broken task name --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2ae575de..7412e4b4 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -69,7 +69,7 @@ jobs: - name: Unshallow Git clone run: | git fetch --tags --unshallow origin # for "git describe" in coverage.sh - - name: Perform check "${{ matrix.MODE }}" + - name: Collect test coverage env: MODE: coverage-sh TRAVIS_OS_NAME: linux From fe29a25ec008c610faf5fcf47cee3c48fe789ba3 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 7 May 2021 14:45:05 +0200 Subject: [PATCH 2/2] .github/workflows: Re-add repo ppa:ondrej/php(!) to fix wine32 installation Related: https://github.com/actions/virtual-environments/issues/3339 --- .github/workflows/coverage.yml | 2 ++ .github/workflows/linux.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7412e4b4..59ace124 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -51,6 +51,8 @@ jobs: # NOTE: Please note the version-specific ${PATH} extension for Clang in .travis.sh run: |- sudo dpkg --add-architecture i386 # for wine32 + # See https://github.com/actions/virtual-environments/issues/3339#issuecomment-834355074 + sudo apt-add-repository --yes "ppa:ondrej/php" # for wine32, not kidding sudo apt-get update sudo apt-get install --yes --no-install-recommends -V \ clang-11 \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index caab5f5e..4ec305c5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -85,6 +85,8 @@ jobs: # NOTE: Please note the version-specific ${PATH} extension for Clang in .travis.sh run: |- sudo dpkg --add-architecture i386 # for wine32 + # See https://github.com/actions/virtual-environments/issues/3339#issuecomment-834355074 + sudo apt-add-repository --yes "ppa:ondrej/php" # for wine32, not kidding sudo apt-get update sudo apt-get install --yes --no-install-recommends -V \ clang-11 \