From 12c4957318c1e9c251d75d6cd400a105d9060938 Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven@timescale.com>
Date: Thu, 20 May 2021 20:23:36 +0200
Subject: [PATCH] Explicitly install clang-9 in CI ubuntu images

GitHub removed default installation of clang-9 from the ubuntu
images but those are required to build postgres with llvm so we have
to explicitly install the required packages.

https://github.com/actions/virtual-environments/pull/3381
---
 .github/workflows/linux-build-and-test.yaml | 2 +-
 scripts/gh_matrix_builder.py                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux-build-and-test.yaml b/.github/workflows/linux-build-and-test.yaml
index ff397ab33e6..c5c6339654e 100644
--- a/.github/workflows/linux-build-and-test.yaml
+++ b/.github/workflows/linux-build-and-test.yaml
@@ -64,7 +64,7 @@ jobs:
         key: ${{ matrix.os }}-postgresql-${{ matrix.pg }}-${{ matrix.cc }}-${{ matrix.build_type }}${{ env.CACHE_SUFFIX }}
 
     - name: Build PostgreSQL ${{ matrix.pg }} ${{ matrix.build_type }}
-      if: steps.cache-postgresql.outputs.cache-hit != 'true'
+#      if: steps.cache-postgresql.outputs.cache-hit != 'true'
       run: |
         wget -q -O postgresql.tar.bz2 https://ftp.postgresql.org/pub/source/v${{ matrix.pg }}/postgresql-${{ matrix.pg }}.tar.bz2
         mkdir -p ~/$PG_SRC_DIR
diff --git a/scripts/gh_matrix_builder.py b/scripts/gh_matrix_builder.py
index 56ea366f2dd..ee078defb81 100644
--- a/scripts/gh_matrix_builder.py
+++ b/scripts/gh_matrix_builder.py
@@ -49,6 +49,7 @@ def build_debug_config(overrides):
     "tsdb_build_args": "-DCODECOVERAGE=ON -DWARNINGS_AS_ERRORS=ON",
     "installcheck_args": "IGNORES='bgw_db_scheduler'",
     "coverage": True,
+    "extra_packages": "clang-9 llvm-9 llvm-9-dev llvm-9-tools",
     "llvm_config": "llvm-config-9",
     "clang": "clang-9",
     "os": "ubuntu-20.04",
@@ -100,6 +101,7 @@ def macos_config(overrides):
     "llvm_config": "/usr/local/opt/llvm/bin/llvm-config",
     "coverage": False,
     "installcheck_args": "IGNORES='bgw_db_scheduler bgw_launcher remote_connection'",
+    "extra_packages": "",
   })
   base_config.update(overrides)
   return base_config