Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/psp-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ jobs:
strategy:
matrix:
os: ['ubuntu-22.04']
compiler: [gcc, clang]
build_type: [debug,debugoptimized]
build_script: [make, meson]
uses: ./.github/workflows/psp-reusable.yml
with:
os: ${{ matrix.os }}
compiler: ${{ matrix.compiler }}
build_type: ${{ matrix.build_type }}
build_script: ${{ matrix.build_script }}
secrets: inherit
6 changes: 5 additions & 1 deletion .github/workflows/psp-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
os:
type: string
required: true
compiler:
type: string
required: true
build_type:
type: string
required: true
Expand All @@ -13,7 +16,8 @@ on:
required: true

env:
artifact_name: build-${{ inputs.os }}-${{ inputs.build_script }}-${{ inputs.build_type }}
artifact_name: build-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
CC: ${{ inputs.compiler }}

jobs:
build:
Expand Down
6 changes: 5 additions & 1 deletion ci_scripts/ubuntu-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ DEPS=(
libzstd-dev
lz4
mawk
meson
perl
pkgconf
python3-dev
python3
python3-pip
python3-setuptools
python3-wheel
systemtap-sdt-dev
tcl-dev
uuid-dev
Expand All @@ -51,6 +54,7 @@ sudo apt-get update
sudo apt-get install -y ${DEPS[@]}

bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
pip3 install meson

# Vault
wget -O - https://apt.releases.hashicorp.com/gpg | sudo tee /etc/apt/keyrings/hashicorp-archive-keyring.asc
Expand Down