Skip to content

Commit

Permalink
Small changes
Browse files Browse the repository at this point in the history
  • Loading branch information
joka921 committed Dec 11, 2023
1 parent 47d9816 commit 8e9dece
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/install-compiler-ubuntu/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ runs:
using: "composite"
steps:
- name: Add PPA for GCC
if : inputs.compiler == 'gcc'
run : sudo add-apt-repository ppa:ubuntu-toolchain-r/test && sudo apt update
shell: bash
if : inputs.compiler == 'gcc'

- name: Install gcc
run : sudo apt install -y gcc-${{inputs.compiler-version}} g++-${{inputs.compiler-version}}
if : inputs.compiler == 'gcc'
run : sudo apt install -y gcc-${{inputs.compiler-version}} g++-${{inputs.compiler-version}}
shell: bash

- name: Install clang
if : inputs.compiler == 'clang'
# The sed command fixes a bug in `llvm.sh` in combination with the latest version of
# `apt-key`. Without it the GPG key for the llvm repository is downloaded but deleted
# immediately after.
Expand All @@ -29,6 +32,6 @@ runs:
sed 's/apt-key del/echo/' llvm.sh -iy
sudo ./llvm.sh ${{inputs.compiler-version}}
sudo apt install -y clang-${{inputs.compiler-version}}
if : inputs.compiler == 'clang'
shell: bash
# TODO<joka921> Add assertion for unsupported compiler version.

# TODO<joka921> Add assertion for unsupported compilers and versions.
9 changes: 6 additions & 3 deletions .github/workflows/install-dependencies-ubuntu/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@ runs:
sudo apt-get update
sudo apt-get install -y build-essential
shell: bash

- name: Install third-party libraries
if: inputs.install-third-party-libraries == 'true'
run: |
sudo apt-get install -y libicu-dev tzdata libzstd-dev libjemalloc-dev
shell: bash

- name: Install boost from PPA
if: inputs.install-third-party-libraries == 'true'
- name: Install boost from PPa
run: sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt install -y libboost1.81-all-dev libboost-url1.81-dev
if: inputs.install-third-party-libraries == 'true'
shell: bash
- name: Install python packages for E2E tests

- name: Install Python packages for E2E tests
run: sudo apt-get install python3-yaml unzip pkg-config python3-icu
shell: bash

0 comments on commit 8e9dece

Please sign in to comment.