Skip to content

Commit

Permalink
Explicitly install clang-9 in CI ubuntu images
Browse files Browse the repository at this point in the history
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.

actions/runner-images#3381
  • Loading branch information
svenklemm committed May 20, 2021
1 parent c102731 commit 12c4957
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/linux-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions scripts/gh_matrix_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 12c4957

Please sign in to comment.