From 57a4e7e7bcf848a694bca488198389c668e9b80f Mon Sep 17 00:00:00 2001 From: Christian Blichmann Date: Wed, 15 Jun 2022 02:58:50 -0700 Subject: [PATCH] GitHub Actions: Rename workflows, fix libxls - Shorter names, as build matrix already contains OS/compiler or OS/contrib-package combinations - libxls was missing `gettext` and `autoconf-archive` packages PiperOrigin-RevId: 455079247 Change-Id: Iae55644a818f3e1840cc18344caa9cc4277d012b --- .github/workflows/fedora-cmake.yml | 2 +- .github/workflows/ubuntu-cmake-contrib.yml | 7 ++++++- .github/workflows/ubuntu-cmake.yml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fedora-cmake.yml b/.github/workflows/fedora-cmake.yml index 1055469..2daf751 100644 --- a/.github/workflows/fedora-cmake.yml +++ b/.github/workflows/fedora-cmake.yml @@ -1,4 +1,4 @@ -name: CMake Fedora +name: cmake on: [push, pull_request] diff --git a/.github/workflows/ubuntu-cmake-contrib.yml b/.github/workflows/ubuntu-cmake-contrib.yml index 6bb4c5e..67d00cb 100644 --- a/.github/workflows/ubuntu-cmake-contrib.yml +++ b/.github/workflows/ubuntu-cmake-contrib.yml @@ -1,4 +1,4 @@ -name: CMake Ubuntu Contrb +name: cmake-contrib on: [push, pull_request] @@ -71,6 +71,11 @@ jobs: run: | sudo apt-get install -qy libidn2-dev libunistring-dev + - name: Install extra dependencies for contrib + if: matrix.contrib == 'libxls' + run: | + sudo apt-get install -qy autoconf-archive gettext + - name: Create Build Environment run: | pip3 install absl-py clang diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml index 7aebb03..820b4cb 100644 --- a/.github/workflows/ubuntu-cmake.yml +++ b/.github/workflows/ubuntu-cmake.yml @@ -1,4 +1,4 @@ -name: CMake Ubuntu +name: cmake on: [push, pull_request]