From 8a7333ef49a55649f704ac2e2db195caf3e4ae56 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 29 Jan 2023 14:44:03 +0100 Subject: [PATCH] Fix package install in CI shoutout to github for shipping broken OS images --- .github/workflows/build.yml | 6 ++++-- util/ci/script.sh | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7ebc16..a6869db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,19 +7,21 @@ on: - '**.[ch]' - '**.cpp' - '**/CMakeLists.txt' + - 'util/ci/**' - '.github/workflows/**.yml' pull_request: paths: - '**.[ch]' - '**.cpp' - '**/CMakeLists.txt' + - 'util/ci/**' - '.github/workflows/**.yml' jobs: gcc: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source util/ci/script.sh @@ -41,7 +43,7 @@ jobs: clang: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source util/ci/script.sh diff --git a/util/ci/script.sh b/util/ci/script.sh index 4557bd7..d818d13 100755 --- a/util/ci/script.sh +++ b/util/ci/script.sh @@ -4,7 +4,8 @@ install_linux_deps() { local pkgs=(cmake libgd-dev libsqlite3-dev libleveldb-dev libpq-dev libhiredis-dev libzstd-dev) sudo apt-get update - sudo apt-get install -y --no-install-recommends ${pkgs[@]} "$@" + sudo apt-get remove -y 'libgd3' nginx || : # ???? + sudo apt-get install -y --no-install-recommends "${pkgs[@]}" "$@" } run_build() {