From 163b92f30630dc03e5d5ba0e5ade889e06033e44 Mon Sep 17 00:00:00 2001
From: Daniel Anderson <dlanders@cs.cmu.edu>
Date: Wed, 17 Sep 2025 12:43:54 -0600
Subject: [PATCH 1/3] Update CI to use newer Ubuntu image since 20 was
 deprecated. Deprecate support for OpenMP

---
 .github/workflows/build.yml | 72 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ceb9389..6d52a267 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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,
@@ -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)

From 8d7c401400cd39ff7d21d6e362b29e9b25faf6eb Mon Sep 17 00:00:00 2001
From: Daniel Anderson <dlanders@cs.cmu.edu>
Date: Wed, 17 Sep 2025 12:46:11 -0600
Subject: [PATCH 2/3] Update Windows runner image too

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d52a267..ad7fbbe6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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}
@@ -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}

From d4ab2090946b3555b8591fa6f368dd9f5099dc9a Mon Sep 17 00:00:00 2001
From: Daniel Anderson <dlanders@cs.cmu.edu>
Date: Wed, 17 Sep 2025 13:25:34 -0600
Subject: [PATCH 3/3] Increment version

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 228615ea..1cb13de2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)