From 61f794f6b2285b6a7d9a96acf58ce42e54428e9b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/18] Make the library modular usable. --- build.jam | 25 +++++++++++++++++++++++++ Jamfile.v2 => example/Jamfile.v2 | 5 ++++- test/Jamfile.v2 | 6 +++++- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 build.jam rename Jamfile.v2 => example/Jamfile.v2 (91%) diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..90053df --- /dev/null +++ b/build.jam @@ -0,0 +1,25 @@ +# Copyright René Ferdinand Rivera Morell 2023 +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import project ; + +project /boost/sort + : common-requirements + /boost/config//boost_config + /boost/core//boost_core + /boost/range//boost_range + /boost/static_assert//boost_static_assert + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_sort ] + [ alias all : boost_sort example test ] + ; + +call-if + : boost-library sort + ; diff --git a/Jamfile.v2 b/example/Jamfile.v2 similarity index 91% rename from Jamfile.v2 rename to example/Jamfile.v2 index da650b3..881d12e 100644 --- a/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -11,7 +11,10 @@ if --tune in [ modules.peek : ARGV ] properties = . release ; } -project spreadsort : source-location example : requirements ../.. ../../.. $(properties) ; +project : requirements $(properties) + /boost/algorithm//boost_algorithm + /boost/random//boost_random + ; exe spreadsort : sample.cpp ; exe alreadysorted : alreadysorted.cpp ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 1d581a8..9b8fae3 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -7,9 +7,13 @@ # # See http://www.boost.org/libs/sort for library home page. -import ../../config/checks/config : requires ; +import config : requires ; import testing ; +project : requirements + /boost/test//boost_test_exec_monitor + ; + { test-suite "sort" : [ run integer_sort_test.cpp From 05c52551f946b66add20b97ba6a816cf3649bea6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/18] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 90053df..99dba63 100644 --- a/build.jam +++ b/build.jam @@ -7,11 +7,11 @@ import project ; project /boost/sort : common-requirements - /boost/config//boost_config - /boost/core//boost_core - /boost/range//boost_range - /boost/static_assert//boost_static_assert - /boost/type_traits//boost_type_traits + /boost/config//boost_config + /boost/core//boost_core + /boost/range//boost_range + /boost/static_assert//boost_static_assert + /boost/type_traits//boost_type_traits include ; From b961352925b8c3f5a2ac475f2a77236668b6091f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:32:35 -0500 Subject: [PATCH 03/18] Add missing import-search for cconfig/predef checks. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 9b8fae3..933f27c 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -7,6 +7,7 @@ # # See http://www.boost.org/libs/sort for library home page. +import-search /boost/config/checks ; import config : requires ; import testing ; From 52228ac8e10113077a7e9383016916e9f530e3b6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 04/18] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index 99dba63..187f518 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import project ; project /boost/sort From e3adb39c6471c1c1ca929236ac1c342f02f0bf2f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 05/18] Bump B2 require to 5.2 --- build.jam | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.jam b/build.jam index 187f518..4970081 100644 --- a/build.jam +++ b/build.jam @@ -3,9 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; - -import project ; +require-b2 5.2 ; project /boost/sort : common-requirements From 65bc508b76ef960a09da1f72edb1123b3c91ec17 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:25:44 -0500 Subject: [PATCH 06/18] Change all references to . --- example/Jamfile.v2 | 4 ++-- test/Jamfile.v2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 881d12e..d088ffc 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -12,8 +12,8 @@ if --tune in [ modules.peek : ARGV ] } project : requirements $(properties) - /boost/algorithm//boost_algorithm - /boost/random//boost_random + /boost/algorithm//boost_algorithm + /boost/random//boost_random ; exe spreadsort : sample.cpp ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 933f27c..56b4226 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -12,7 +12,7 @@ import config : requires ; import testing ; project : requirements - /boost/test//boost_test_exec_monitor + /boost/test//boost_test_exec_monitor ; { From e6f9ca6ef8eef413df8c97d1a488d3a68dc1b399 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 07/18] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 4970081..d1ec57f 100644 --- a/build.jam +++ b/build.jam @@ -1,4 +1,4 @@ -# Copyright René Ferdinand Rivera Morell 2023 +# Copyright René Ferdinand Rivera Morell 2023-2024 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) From 968b47368013f8392a232a53bd1f3202bcb65bce Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 08/18] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build.jam b/build.jam index d1ec57f..45f2631 100644 --- a/build.jam +++ b/build.jam @@ -5,21 +5,24 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/config//boost_config + /boost/core//boost_core + /boost/range//boost_range + /boost/static_assert//boost_static_assert + /boost/type_traits//boost_type_traits ; + project /boost/sort : common-requirements - /boost/config//boost_config - /boost/core//boost_core - /boost/range//boost_range - /boost/static_assert//boost_static_assert - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_sort ] + [ alias boost_sort : : : : $(boost_dependencies) ] [ alias all : boost_sort example test ] ; call-if : boost-library sort ; + From 9640167bf88dcd2577dad60ae0ebf6f342157b2b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 10:05:33 -0500 Subject: [PATCH 09/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 224 ++++++--------------------------------- 1 file changed, 34 insertions(+), 190 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 368d074..7b6aa4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,200 +17,44 @@ jobs: fail-fast: false matrix: include: - - name: "TOOLSET=gcc CXXSTD=03,11 Job 0" - buildtype: "boost" - packages: "" - packages_to_remove: "" - os: "ubuntu-20.04" - container: "ubuntu:16.04" - cxx: "g++" - sources: "" - llvm_os: "" - llvm_ver: "" - toolset: "gcc" - cxxstd: "03,11" - - name: "TOOLSET=clang CXXSTD=03,11,14,1z Job 1" - buildtype: "boost" - packages: "libstdc++-4.9-dev clang" - packages_to_remove: "" - os: "ubuntu-20.04" - container: "ubuntu:16.04" - cxx: "clang++" - sources: "" - llvm_os: "" - llvm_ver: "" + - name: "g++13" + os: ubuntu-latest + packages: "g++-13" + toolset: "gcc-13" + - name: "clang-17" + os: ubuntu-latest + packages: "clang-17" + toolset: "clang-17" + - name: "xcode" + os: macos-latest toolset: "clang" - cxxstd: "03,11,14,1z" - - runs-on: ${{ matrix.os }} - container: ${{ matrix.container }} - + runs-on: ${{matrix.os}} steps: - - name: Check if running in container - if: matrix.container != '' - run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV - - name: If running in container, upgrade packages - if: matrix.container != '' - run: | - apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev - sudo apt-add-repository ppa:git-core/ppa - sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git - python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))') - sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py - sudo python3 get-pip.py - sudo /usr/local/bin/pip install cmake - - - uses: actions/checkout@v2 - - - name: linux - shell: bash - env: - CXX: ${{ matrix.cxx }} - SOURCES: ${{ matrix.sources }} - LLVM_OS: ${{ matrix.llvm_os }} - LLVM_VER: ${{ matrix.llvm_ver }} - PACKAGES: ${{ matrix.packages }} - PACKAGES_TO_REMOVE: ${{ matrix.packages_to_remove }} - JOB_BUILDTYPE: ${{ matrix.buildtype }} - TOOLSET: ${{ matrix.toolset }} - CXXSTD: ${{ matrix.cxxstd }} - TRAVIS_BRANCH: ${{ github.base_ref }} - TRAVIS_OS_NAME: "linux" + - uses: actions/checkout@main + - name: Install + if: matrix.packages + run: sudo apt install ${{matrix.packages}} + - name: Setup run: | - echo '==================================> SETUP' - echo '==================================> PACKAGES' - set -e - if [ -n "$PACKAGES_TO_REMOVE" ]; then sudo apt-get purge -y $PACKAGES_TO_REMOVE; fi - echo ">>>>> APT: REPO.." - for i in {1..3}; do sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break || sleep 2; done - - if test -n "${LLVM_OS}" ; then - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - if test -n "${LLVM_VER}" ; then - sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main" - else - # Snapshot (i.e. trunk) build of clang - sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS} main" - fi - fi - echo ">>>>> APT: UPDATE.." - sudo -E apt-get -o Acquire::Retries=3 update - if test -n "${SOURCES}" ; then - echo ">>>>> APT: INSTALL SOURCES.." - for SOURCE in $SOURCES; do - sudo -E apt-add-repository ppa:$SOURCE - done - fi - echo ">>>>> APT: INSTALL ${PACKAGES}.." - sudo -E DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=3 -y --no-install-suggests --no-install-recommends install ${PACKAGES} - - echo '==================================> INSTALL AND COMPILE' - set -e - export TRAVIS_BUILD_DIR=$(pwd) - export TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')} - export VCS_COMMIT_ID=$GITHUB_SHA - export GIT_COMMIT=$GITHUB_SHA - export REPO_NAME=$(basename $GITHUB_REPOSITORY) - export USER=$(whoami) - export CC=${CC:-gcc} - export PATH=~/.local/bin:/usr/local/bin:$PATH - - if [ "$JOB_BUILDTYPE" == "boost" ]; then - - echo '==================================> INSTALL' - - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true + echo GITHUB_BASE_REF: $GITHUB_BASE_REF + echo GITHUB_REF: $GITHUB_REF + REF=${GITHUB_BASE_REF:-$GITHUB_REF} + REF=${REF#refs/heads/} + echo REF: $REF + BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true + BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/sort/boost}.git + echo BOOST_GIT: ${BOOST_GIT} + echo BOOST_BRANCH: ${BOOST_BRANCH} cd .. - git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root + git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root cd boost-root - git submodule update --init tools/build - git submodule update --init libs/config - git submodule update --init tools/boostdep - cp -r $TRAVIS_BUILD_DIR/* libs/sort - python tools/boostdep/depinst/depinst.py sort + git submodule update --init --jobs 3 tools/boostdep libs/assert libs/config libs/core libs/sort + python tools/boostdep/depinst/depinst.py -X test -g "--jobs 3" sort + rm -rf libs/sort/* + cp -r $GITHUB_WORKSPACE/* libs/sort ./bootstrap.sh - ./b2 headers - - echo '==================================> SCRIPT' - - ./b2 libs/sort/test toolset=$TOOLSET cxxstd=$CXXSTD - - fi - osx: - strategy: - fail-fast: false - matrix: - include: - - name: "TOOLSET=clang CXXSTD=03,11,14,1z Job 2" - buildtype: "boost" - packages: "" - os: "macos-12" - cxx: "clang++" - sources: "" - llvm_os: "" - llvm_ver: "" - xcode_version: 14.2 - toolset: "clang" - cxxstd: "03,11,14,1z" - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - - name: Set DEVELOPER_DIR - if: matrix.xcode_version != '' - run: echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer" >> $GITHUB_ENV - - name: Test DEVELOPER_DIR - run: echo $DEVELOPER_DIR - - - name: "osx" - shell: bash - env: - CXX: ${{ matrix.cxx }} - SOURCES: ${{ matrix.sources }} - LLVM_OS: ${{ matrix.llvm_os }} - LLVM_VER: ${{ matrix.llvm_ver }} - PACKAGES: ${{ matrix.packages }} - JOB_BUILDTYPE: ${{ matrix.buildtype }} - TOOLSET: ${{ matrix.toolset }} - CXXSTD: ${{ matrix.cxxstd }} - TRAVIS_BRANCH: ${{ github.base_ref }} - TRAVIS_OS_NAME: "osx" + ./b2 -d0 headers + - name: Test run: | - echo '==================================> SETUP' - set -e - sudo mv /Library/Developer/CommandLineTools /Library/Developer/CommandLineTools.bck - echo '==================================> PACKAGES' - echo '==================================> INSTALL AND COMPILE' - set -e - export TRAVIS_BUILD_DIR=$(pwd) - export TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')} - export VCS_COMMIT_ID=$GITHUB_SHA - export GIT_COMMIT=$GITHUB_SHA - export REPO_NAME=$(basename $GITHUB_REPOSITORY) - export USER=$(whoami) - export CC=${CC:-gcc} - export PATH=~/.local/bin:/usr/local/bin:$PATH - - if [ "$JOB_BUILDTYPE" == "boost" ]; then - - echo '==================================> INSTALL' - - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true - cd .. - git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root - cd boost-root - git submodule update --init tools/build - git submodule update --init libs/config - git submodule update --init tools/boostdep - cp -r $TRAVIS_BUILD_DIR/* libs/sort - python tools/boostdep/depinst/depinst.py sort - ./bootstrap.sh - ./b2 headers - - echo '==================================> SCRIPT' - - ./b2 libs/sort/test toolset=$TOOLSET cxxstd=$CXXSTD - - fi + cd ../boost-root + ./b2 -j3 libs/sort/test toolset=${{matrix.toolset}} cxxstd=11,14,17,20 From d1d38301a465edc43af79cce09922c5e66ca8a70 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 10:12:13 -0500 Subject: [PATCH 10/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b6aa4a..59df5a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: include: - - name: "g++13" + - name: "g++-13" os: ubuntu-latest packages: "g++-13" toolset: "gcc-13" @@ -33,7 +33,10 @@ jobs: - uses: actions/checkout@main - name: Install if: matrix.packages - run: sudo apt install ${{matrix.packages}} + run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt-get -o Acquire::Retries=3 update -y + sudo apt-get -o Acquire::Retries=3 -y install ${{matrix.packages}} - name: Setup run: | echo GITHUB_BASE_REF: $GITHUB_BASE_REF @@ -48,7 +51,7 @@ jobs: cd .. git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root cd boost-root - git submodule update --init --jobs 3 tools/boostdep libs/assert libs/config libs/core libs/sort + git submodule update --init --jobs 3 tools/boostdep libs/assert libs/config libs/core libs/test libs/sort python tools/boostdep/depinst/depinst.py -X test -g "--jobs 3" sort rm -rf libs/sort/* cp -r $GITHUB_WORKSPACE/* libs/sort From 61b3613abced857ac034867db1b96deccd67d787 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 10:13:17 -0500 Subject: [PATCH 11/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59df5a5..38de644 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: os: ubuntu-latest packages: "g++-13" toolset: "gcc-13" - - name: "clang-17" + - name: "clang-16" os: ubuntu-latest - packages: "clang-17" - toolset: "clang-17" + packages: "clang-16" + toolset: "clang-16" - name: "xcode" os: macos-latest toolset: "clang" From 5da7ff37ed6ac414481616c67181852ab80f1d8e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 10:15:05 -0500 Subject: [PATCH 12/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38de644..110a885 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root cd boost-root git submodule update --init --jobs 3 tools/boostdep libs/assert libs/config libs/core libs/test libs/sort + python tools/boostdep/depinst/depinst.py -X test -g "--jobs 3" test python tools/boostdep/depinst/depinst.py -X test -g "--jobs 3" sort rm -rf libs/sort/* cp -r $GITHUB_WORKSPACE/* libs/sort From 5827c482355fde79ade207094382bbaa33a1e094 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 10:51:29 -0500 Subject: [PATCH 13/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 110a885..1b87c82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: os: ubuntu-latest packages: "g++-13" toolset: "gcc-13" - - name: "clang-16" + - name: "clang-18" os: ubuntu-latest - packages: "clang-16" - toolset: "clang-16" + packages: "llvm-toolchain-18" + toolset: "clang-18" - name: "xcode" os: macos-latest toolset: "clang" From c3294fcce902c947a4a00b0f4f7752c1ab284548 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 11:03:57 -0500 Subject: [PATCH 14/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b87c82..dbb3014 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: toolset: "gcc-13" - name: "clang-18" os: ubuntu-latest - packages: "llvm-toolchain-18" + packages: "llvm-18" toolset: "clang-18" - name: "xcode" os: macos-latest From f07ab48f1d6ca08e59524e371fa2a5b8860d12f2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 11:06:43 -0500 Subject: [PATCH 15/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbb3014..3d99b7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: os: ubuntu-latest packages: "g++-13" toolset: "gcc-13" - - name: "clang-18" + - name: "clang-15" os: ubuntu-latest - packages: "llvm-18" - toolset: "clang-18" + packages: "llvm-toolchain-15" + toolset: "clang-15" - name: "xcode" os: macos-latest toolset: "clang" From 8a2c4b655d18438b896db79835ab0404e9c9630a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 11:19:44 -0500 Subject: [PATCH 16/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d99b7a..b20576c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: toolset: "gcc-13" - name: "clang-15" os: ubuntu-latest - packages: "llvm-toolchain-15" + packages: "clang-15" toolset: "clang-15" - name: "xcode" os: macos-latest From c99bf6a41e7c2b4a10f3ae24a3cb2e9cedb2b367 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 11:20:38 -0500 Subject: [PATCH 17/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b20576c..dc298f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,6 @@ jobs: - name: Install if: matrix.packages run: | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt-get -o Acquire::Retries=3 update -y sudo apt-get -o Acquire::Retries=3 -y install ${{matrix.packages}} - name: Setup From b4fadedfcfdfbf2d885793deb2b7125d05a3bcbb Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 11:33:46 -0500 Subject: [PATCH 18/18] Try and fix GHA setup. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc298f8..b20576c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: - name: Install if: matrix.packages run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt-get -o Acquire::Retries=3 update -y sudo apt-get -o Acquire::Retries=3 -y install ${{matrix.packages}} - name: Setup