Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update github actions #106

Merged
merged 2 commits into from
Dec 15, 2024
Merged

update github actions #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a73c0a
update github actions
timblechmann Dec 13, 2024
e9a3f39
tests: appleclang compile fix
timblechmann Dec 14, 2024
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
62 changes: 29 additions & 33 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ jobs:
os: ubuntu-22.04
install: g++-13
supported: true
- toolset: gcc-14
cxxstd: "14,17,20"
os: ubuntu-24.04
install: g++-14
supported: true
- toolset: clang
install: clang-10
compiler: clang++-10
Expand Down Expand Up @@ -107,11 +112,6 @@ jobs:
# supported: true

# macos
- description: macos-12
toolset: clang
cxxstd: "14,17,20"
os: macos-12
supported: true
- description: macos-13
toolset: clang
cxxstd: "14,17,20"
Expand All @@ -122,6 +122,11 @@ jobs:
cxxstd: "14,17,2a"
os: macos-14
supported: true
- description: macos-15
toolset: clang
cxxstd: "14,17,20"
os: macos-15
supported: true



Expand Down Expand Up @@ -231,40 +236,31 @@ jobs:
fail-fast: false
matrix:
include:
- description: msvc-14.2-32
toolset: msvc-14.2
cxxstd: "14,17"
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
supported: true
addrmd: 32
- toolset: msvc-14.0
cxxstd: "14,latest"
addrmd: 32,64
os: windows-2019
- description: msvc-14.3-32
toolset: msvc-14.3
cxxstd: "14,17,20"
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
supported: true
addrmd: 32
- toolset: msvc-14.2
cxxstd: "14,17,20,latest"
addrmd: 32,64
os: windows-2019
- description: msvc-14.2-64
toolset: msvc-14.2
cxxstd: "14,17"
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
supported: true
addrmd: 64
os: windows-2019
- description: msvc-14.3-64
toolset: msvc-14.3
cxxstd: "14,17,20"
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
- toolset: msvc-14.3
cxxstd: "14,17,20,latest"
addrmd: 32,64
os: windows-2022
supported: true
- toolset: clang-win
cxxstd: "14,17,20,latest"
addrmd: 32,64
os: windows-2022
supported: true
addrmd: 64
os: windows-2019
- toolset: gcc
cxxstd: "14,17,2a"
addrmd: 64
cxxflags: "cxxflags=-Wa,-mbig-obj"
supported: true
os: windows-2019
supported: true

needs: [runner-selection]
# runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
Expand Down Expand Up @@ -329,9 +325,9 @@ jobs:
include:
- os: ubuntu-22.04
- os: ubuntu-24.04
- os: macos-12
- os: macos-13
- os: macos-14
- os: macos-15

runs-on: ${{matrix.os}}

Expand Down Expand Up @@ -377,9 +373,9 @@ jobs:
include:
- os: ubuntu-22.04
- os: ubuntu-24.04
- os: macos-12
- os: macos-13
- os: macos-14
- os: macos-15

runs-on: ${{matrix.os}}

Expand Down Expand Up @@ -435,9 +431,9 @@ jobs:
include:
- os: ubuntu-22.04
- os: ubuntu-24.04
- os: macos-12
- os: macos-13
- os: macos-14
- os: macos-15

runs-on: ${{matrix.os}}

Expand Down
4 changes: 1 addition & 3 deletions test/queue_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
#include <memory>


using namespace boost;
using namespace boost::lockfree;
using namespace std;

BOOST_AUTO_TEST_CASE( simple_queue_test )
{
Expand Down Expand Up @@ -152,7 +150,7 @@ BOOST_AUTO_TEST_CASE( queue_convert_pop_test )
}

{
unique_ptr< int > i3;
std::unique_ptr< int > i3;
BOOST_TEST_REQUIRE( f.pop( i3 ) );

BOOST_TEST_REQUIRE( *i3 == 3 );
Expand Down
Loading