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
80 changes: 40 additions & 40 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
build_type: ["Debug", "RelWithDebInfo", "Release"]
config:
- {
os: ubuntu-20.04, # Note: GCC-7 is gone in Ubuntu-22
cc: "gcc-7", cxx: "g++-7"
os: ubuntu-22.04,
cc: "gcc-9", cxx: "g++-9"
}
- {
os: ubuntu-22.04,
cc: "gcc-12", cxx: "g++-12"
}
- {
os: ubuntu-20.04,
cc: "clang-6.0", cxx: "clang++-6.0"
os: ubuntu-22.04,
cc: "clang-11", cxx: "clang++-11"
}
- {
os: ubuntu-22.04,
Expand Down Expand Up @@ -129,9 +129,9 @@ jobs:
- { cc: "gcc-12", cxx: "g++-12" }
- { cc: "clang-15", cxx: "clang++-15" }

name: windows-2019 WSL Ubuntu 22.04 ${{ matrix.config.cxx }} (Debug)
name: windows-2025 WSL Ubuntu 22.04 ${{ matrix.config.cxx }} (Debug)
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: windows-2019
runs-on: windows-2025
defaults:
run:
shell: wsl-bash {0}
Expand Down Expand Up @@ -291,12 +291,12 @@ jobs:
ctest -C Debug --no-tests=error --output-on-failure

# cilk-plus:
# name: windows-2019 WSL Ubuntu-18.04 Cilk Plus GCC-7 (Debug)
# name: windows-2025 WSL Ubuntu-18.04 Cilk Plus GCC-7 (Debug)
# if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
#
# # Note: GCC-7 on Ubuntu 20 removed Cilk Plus, so we have to go back in time to
# # Ubuntu 18 which GitHub stopped supporting, so we go through WSL instead.
# runs-on: windows-2019
# runs-on: windows-2025
# defaults:
# run:
# shell: wsl-bash {0}
Expand Down Expand Up @@ -367,38 +367,38 @@ jobs:
cd build
ctest -C Debug --no-tests=error --output-on-failure

omp:
name: ubuntu-22.04 OpenMP Clang 15 (Debug)
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Install OpenMP
shell: bash
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
sudo apt-get update
sudo apt-get -qq install clang-15 libomp-15-dev

- name: Configure
shell: bash
run: |
mkdir build && cd build
CC=clang-15 CXX=clang++-15 cmake -DCMAKE_BUILD_TYPE=Debug -DPARLAY_TEST=On -DPARLAY_OPENMP=On DPARLAY_BENCHMARK=On -DPARLAY_EXAMPLES=On ..

- name: Build
shell: bash
run: |
cd build
cmake --build . --config Debug

- name: Test
shell: bash
run: |
cd build
ctest -C Debug --no-tests=error --output-on-failure
# omp:
# name: ubuntu-22.04 OpenMP Clang 15 (Debug)
# if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2

# - name: Install OpenMP
# shell: bash
# run: |
# wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
# sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
# sudo apt-get update
# sudo apt-get -qq install clang-15 libomp-15-dev

# - name: Configure
# shell: bash
# run: |
# mkdir build && cd build
# CC=clang-15 CXX=clang++-15 cmake -DCMAKE_BUILD_TYPE=Debug -DPARLAY_TEST=On -DPARLAY_OPENMP=On DPARLAY_BENCHMARK=On -DPARLAY_EXAMPLES=On ..

# - name: Build
# shell: bash
# run: |
# cd build
# cmake --build . --config Debug

# - name: Test
# shell: bash
# run: |
# cd build
# ctest -C Debug --no-tests=error --output-on-failure

tbb:
name: ubuntu-22.04 TBB Clang 15 (Debug)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

cmake_minimum_required(VERSION 3.14)

project(PARLAY VERSION 2.3.2
project(PARLAY VERSION 2.3.3
DESCRIPTION "A collection of parallel algorithms and other support for parallelism in C++"
LANGUAGES CXX)

Expand Down
Loading