From 88b0e06e045db60f4c4a87e98934aba46ba2d28b Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Sun, 6 Oct 2024 11:08:39 -0400 Subject: [PATCH 1/9] simplifying CI: ubuntu install --- .github/workflows/ubuntu_install.yml | 31 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ubuntu_install.yml b/.github/workflows/ubuntu_install.yml index a955babba..9c7debc0f 100644 --- a/.github/workflows/ubuntu_install.yml +++ b/.github/workflows/ubuntu_install.yml @@ -1,45 +1,44 @@ name: Ubuntu 22.04 (Installation) - on: pull_request: - types: [opened, synchronize, reopened, ready_for_review] + types: + - opened + - synchronize + - reopened + - ready_for_review paths-ignore: - - '**.md' - - 'docs/**' + - "**.md" + - docs/** push: branches: - main paths-ignore: - - '**.md' - - 'docs/**' - + - "**.md" + - docs/** permissions: contents: read - concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - jobs: ubuntu-build: runs-on: ubuntu-22.04 - strategy: - matrix: - include: - shared: [ON, OFF] steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - name: Setup Ninja run: sudo apt-get install ninja-build - name: Prepare - run: cmake -G Ninja -DBUILD_SHARED_LIBS=${{matrix.shared}} -DCMAKE_INSTALL_PREFIX:PATH=destination -B build + run: cmake -G Ninja -DBUILD_SHARED_LIBS=ON + -DCMAKE_INSTALL_PREFIX:PATH=destination -B build - name: Build run: cmake --build build -j=4 - name: Install run: cmake --install build - name: Prepare test package - run: cmake -DCMAKE_INSTALL_PREFIX:PATH=../../destination -S tests/installation -B buildbabyada + run: cmake -DCMAKE_INSTALL_PREFIX:PATH=../../destination -S tests/installation + -B buildbabyada - name: Build test package run: cmake --build buildbabyada - name: Run example run: ./buildbabyada/main + From 89f4a45d40ae0808844973a64b726dbf69faae01 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Sun, 6 Oct 2024 18:33:16 -0400 Subject: [PATCH 2/9] Update .github/workflows/ubuntu_install.yml Co-authored-by: Yagiz Nizipli --- .github/workflows/ubuntu_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_install.yml b/.github/workflows/ubuntu_install.yml index 9c7debc0f..7b36e5aae 100644 --- a/.github/workflows/ubuntu_install.yml +++ b/.github/workflows/ubuntu_install.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Ninja run: sudo apt-get install ninja-build - name: Prepare - run: cmake -G Ninja -DBUILD_SHARED_LIBS=ON + run: cmake -G Ninja -DBUILD_SHARED_LIBS=ON | -DCMAKE_INSTALL_PREFIX:PATH=destination -B build - name: Build run: cmake --build build -j=4 From c3b8b251ad67a0272778f255c26228af9c60a5d0 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Sun, 6 Oct 2024 18:33:22 -0400 Subject: [PATCH 3/9] Update .github/workflows/ubuntu_install.yml Co-authored-by: Yagiz Nizipli --- .github/workflows/ubuntu_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_install.yml b/.github/workflows/ubuntu_install.yml index 7b36e5aae..22723d960 100644 --- a/.github/workflows/ubuntu_install.yml +++ b/.github/workflows/ubuntu_install.yml @@ -35,7 +35,7 @@ jobs: - name: Install run: cmake --install build - name: Prepare test package - run: cmake -DCMAKE_INSTALL_PREFIX:PATH=../../destination -S tests/installation + run: cmake -DCMAKE_INSTALL_PREFIX:PATH=../../destination -S tests/installation | -B buildbabyada - name: Build test package run: cmake --build buildbabyada From 6b7a3aefbcdc01045fdf11afcb7194fd459807d8 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Mon, 7 Oct 2024 15:40:49 -0400 Subject: [PATCH 4/9] Update ubuntu_install.yml --- .github/workflows/ubuntu_install.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_install.yml b/.github/workflows/ubuntu_install.yml index 22723d960..8579ac7e0 100644 --- a/.github/workflows/ubuntu_install.yml +++ b/.github/workflows/ubuntu_install.yml @@ -28,8 +28,7 @@ jobs: - name: Setup Ninja run: sudo apt-get install ninja-build - name: Prepare - run: cmake -G Ninja -DBUILD_SHARED_LIBS=ON | - -DCMAKE_INSTALL_PREFIX:PATH=destination -B build + run: cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX:PATH=destination -B build - name: Build run: cmake --build build -j=4 - name: Install From 2ad2b3ee085675744a70c94856cb3f5c3d361ada Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Mon, 18 Nov 2024 12:39:35 -0500 Subject: [PATCH 5/9] upgrading to 24. --- .github/workflows/ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index c20fdc5e1..60a45161a 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 +name: Ubuntu 24.04 on: pull_request: @@ -22,7 +22,7 @@ concurrency: jobs: ubuntu-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: shared: [ON, OFF] From fbe840f5963d9bdc54fa516f4482bb93ac9ae130 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Mon, 18 Nov 2024 12:42:17 -0500 Subject: [PATCH 6/9] let us go with defaults --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 60a45161a..6ccb02220 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: shared: [ON, OFF] - cxx: [g++-12, clang++-14] + cxx: [g++, clang++] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup Ninja From f60614ccb929b6cba33e214c9a8a9b564a8bac91 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Mon, 18 Nov 2024 12:46:06 -0500 Subject: [PATCH 7/9] bumping everything to ubuntu 24 --- .github/workflows/ubuntu-release.yml | 6 +++--- .github/workflows/ubuntu-sanitized.yml | 6 +++--- .github/workflows/ubuntu-undef.yml | 6 +++--- .github/workflows/ubuntu_pedantic.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ubuntu-release.yml b/.github/workflows/ubuntu-release.yml index 185d7076f..8608a417c 100644 --- a/.github/workflows/ubuntu-release.yml +++ b/.github/workflows/ubuntu-release.yml @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 (Release build) +name: Ubuntu 24.04 (Release build) on: pull_request: @@ -22,10 +22,10 @@ concurrency: jobs: ubuntu-release-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: - cxx: [g++-12, clang++-14] + cxx: [g++, clang++] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup Ninja diff --git a/.github/workflows/ubuntu-sanitized.yml b/.github/workflows/ubuntu-sanitized.yml index 8716f05de..83bb33aa1 100644 --- a/.github/workflows/ubuntu-sanitized.yml +++ b/.github/workflows/ubuntu-sanitized.yml @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 (GCC 12 SANITIZED) +name: Ubuntu 24.04 (GCC 12 SANITIZED) on: pull_request: @@ -22,7 +22,7 @@ concurrency: jobs: ubuntu-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: shared: [ON, OFF] @@ -33,7 +33,7 @@ jobs: - name: Prepare run: cmake -D ADA_TESTING=ON -DADA_SANITIZE=ON -DADA_DEVELOPMENT_CHECKS=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -G Ninja -B build env: - CXX: g++-12 + CXX: g++ - name: Build run: cmake --build build -j=4 - name: Test diff --git a/.github/workflows/ubuntu-undef.yml b/.github/workflows/ubuntu-undef.yml index e8bc1a126..a3626344c 100644 --- a/.github/workflows/ubuntu-undef.yml +++ b/.github/workflows/ubuntu-undef.yml @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 (GCC 12 SANITIZE UNDEFINED) +name: Ubuntu 24.04 (GCC 12 SANITIZE UNDEFINED) on: pull_request: @@ -22,7 +22,7 @@ concurrency: jobs: ubuntu-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: shared: [ON, OFF] @@ -33,7 +33,7 @@ jobs: - name: Prepare run: cmake -D ADA_TESTING=ON -D ADA_SANITIZE_UNDEFINED=ON -DADA_DEVELOPMENT_CHECKS=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -G Ninja -B build env: - CXX: g++-12 + CXX: g++ - name: Build run: cmake --build build -j=4 - name: Test diff --git a/.github/workflows/ubuntu_pedantic.yml b/.github/workflows/ubuntu_pedantic.yml index ad77a7b04..8c949245e 100644 --- a/.github/workflows/ubuntu_pedantic.yml +++ b/.github/workflows/ubuntu_pedantic.yml @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 (GCC 12) Fails On Compiler Warnings +name: Ubuntu 24.04 Fails On Compiler Warnings on: pull_request: @@ -22,7 +22,7 @@ concurrency: jobs: ubuntu-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: shared: [ON, OFF] @@ -33,7 +33,7 @@ jobs: - name: Prepare run: cmake -D ADA_TESTING=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -G Ninja -B build env: - CXX: g++-12 + CXX: g++ CXXFLAGS: -Werror - name: Build run: cmake --build build -j=4 From 69c012b108f76ef41fe3e58626a10b47fde11c4b Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Mon, 18 Nov 2024 13:09:32 -0500 Subject: [PATCH 8/9] damn it. gcc 11 is the default? --- .github/workflows/ubuntu-sanitized.yml | 2 +- .github/workflows/ubuntu-undef.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu-sanitized.yml b/.github/workflows/ubuntu-sanitized.yml index 83bb33aa1..dc3fbdd4b 100644 --- a/.github/workflows/ubuntu-sanitized.yml +++ b/.github/workflows/ubuntu-sanitized.yml @@ -33,7 +33,7 @@ jobs: - name: Prepare run: cmake -D ADA_TESTING=ON -DADA_SANITIZE=ON -DADA_DEVELOPMENT_CHECKS=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -G Ninja -B build env: - CXX: g++ + CXX: g++-12 - name: Build run: cmake --build build -j=4 - name: Test diff --git a/.github/workflows/ubuntu-undef.yml b/.github/workflows/ubuntu-undef.yml index a3626344c..c6ca5654a 100644 --- a/.github/workflows/ubuntu-undef.yml +++ b/.github/workflows/ubuntu-undef.yml @@ -33,7 +33,7 @@ jobs: - name: Prepare run: cmake -D ADA_TESTING=ON -D ADA_SANITIZE_UNDEFINED=ON -DADA_DEVELOPMENT_CHECKS=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -G Ninja -B build env: - CXX: g++ + CXX: g++-12 - name: Build run: cmake --build build -j=4 - name: Test diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 6ccb02220..1127b8a41 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: shared: [ON, OFF] - cxx: [g++, clang++] + cxx: [g++-12, clang++] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup Ninja From b3fa9aa0f3b7587261ae82ef7078a3a26e55c7b2 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Mon, 18 Nov 2024 14:48:23 -0500 Subject: [PATCH 9/9] adding installation with clang --- .github/workflows/ubuntu_install.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_install.yml b/.github/workflows/ubuntu_install.yml index 43fb0619c..f41ae1216 100644 --- a/.github/workflows/ubuntu_install.yml +++ b/.github/workflows/ubuntu_install.yml @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 (Installation) +name: Ubuntu 24.04 (Installation) on: pull_request: types: @@ -22,7 +22,10 @@ concurrency: cancel-in-progress: true jobs: ubuntu-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 + strategy: + matrix: + cxx: [g++-12, clang++] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup Ninja