diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca46c5d5..2162ebc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -266,7 +266,7 @@ jobs: run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=${{ matrix.standard }} working-directory: ../boost-root/libs/regex/test windows_gcc: - runs-on: windows-2019 + runs-on: windows-latest defaults: run: shell: cmd @@ -312,102 +312,8 @@ jobs: - name: Test run: ..\..\..\b2 --hash %ARGS% working-directory: ../boost-root/libs/regex/test - windows_msvc_14_0: - runs-on: windows-2019 - defaults: - run: - shell: cmd - env: - ARGS: toolset=${{ matrix.toolset }} address-model=64 cxxstd=${{ matrix.standard }} - strategy: - fail-fast: false - matrix: - toolset: [ msvc-14.0 ] - standard: [ 14, 17 ] - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: '0' - - uses: mstachniuk/ci-skip@v1 - with: - commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]' - commit-filter-separator: ';' - fail-fast: true - - name: Checkout main boost - run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - - name: Update tools/boostdep - run: git submodule update --init tools/boostdep - working-directory: ../boost-root - - name: Copy files - run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\regex - working-directory: ../boost-root - - name: Install deps - run: python tools/boostdep/depinst/depinst.py -I example -g "--jobs 3" regex - working-directory: ../boost-root - - name: Bootstrap - run: bootstrap - working-directory: ../boost-root - - name: Generate headers - run: b2 headers - working-directory: ../boost-root - - name: Config info install - run: ..\..\..\b2 config_info_travis_install %ARGS% - working-directory: ../boost-root/libs/config/test - - name: Config info - run: config_info_travis - working-directory: ../boost-root/libs/config/test - - name: Test - run: ..\..\..\b2 --hash %ARGS% - working-directory: ../boost-root/libs/regex/test - windows_msvc_14_2: - runs-on: windows-2019 - defaults: - run: - shell: cmd - env: - ARGS: toolset=${{ matrix.toolset }} address-model=64 cxxstd=${{ matrix.standard }} - strategy: - fail-fast: false - matrix: - toolset: [ msvc-14.2 ] - standard: [ 14, 17, latest ] - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: '0' - - uses: mstachniuk/ci-skip@v1 - with: - commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]' - commit-filter-separator: ';' - fail-fast: true - - name: Checkout main boost - run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root - - name: Update tools/boostdep - run: git submodule update --init tools/boostdep - working-directory: ../boost-root - - name: Copy files - run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\regex - working-directory: ../boost-root - - name: Install deps - run: python tools/boostdep/depinst/depinst.py -I example -g "--jobs 3" regex - working-directory: ../boost-root - - name: Bootstrap - run: bootstrap - working-directory: ../boost-root - - name: Generate headers - run: b2 headers - working-directory: ../boost-root - - name: Config info install - run: ..\..\..\b2 config_info_travis_install %ARGS% - working-directory: ../boost-root/libs/config/test - - name: Config info - run: config_info_travis - working-directory: ../boost-root/libs/config/test - - name: Test - run: ..\..\..\b2 --hash %ARGS% - working-directory: ../boost-root/libs/regex/test windows_msvc_14_3: - runs-on: windows-2022 + runs-on: windows-2025 defaults: run: shell: cmd @@ -460,7 +366,7 @@ jobs: run: msvc_test.bat working-directory: ../boost-root/libs/regex/test/module ubuntu-cmake-install: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false steps: @@ -492,7 +398,7 @@ jobs: cmake --build . cmake --build . --target check ubuntu-cmake-check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false steps: diff --git a/build.jam b/build.jam index b4223a58..9a3ae769 100644 --- a/build.jam +++ b/build.jam @@ -20,11 +20,12 @@ project /boost/regex ; explicit - [ alias boost_regex : build//boost_regex ] - [ alias all : boost_regex example test ] + [ alias boost_regex : : : : $(boost_dependencies) ] + [ alias boost_regex_old : build//boost_regex ] + [ alias all : boost_regex boost_regex_old example test ] ; call-if : boost-library regex - : install boost_regex + : install boost_regex_old ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 6126b7d0..a2c190b4 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -5,7 +5,7 @@ project : requirements - /boost/regex//boost_regex + /boost/regex//boost_regex_old /boost/timer//boost_timer multi shared:BOOST_REGEX_DYN_LINK=1 diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8880deae..17e813ff 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -5,7 +5,7 @@ project : requirements - /boost/regex//boost_regex + /boost/regex//boost_regex_old /boost/detail//boost_detail multi shared:BOOST_REGEX_DYN_LINK=1