Skip to content

Miyanyan timespec #1157

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

Merged
redboltz merged 2 commits into from
May 17, 2025
Merged

Miyanyan timespec #1157

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
0225acf
timespec.hpp: remove duplicated include
miyanyan May 16, 2025
8023a85
Updated CI ubuntu version.
redboltz May 17, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Install build dependencies
run: |
sudo apt-get update
Expand All @@ -24,7 +24,7 @@ jobs:

- name: Cache boost
id: cache-boost
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/boost-prefix/
key: ${{ runner.os }}-boost-1-85-0-2024-05-27
Expand All @@ -35,7 +35,7 @@ jobs:

- name: Cache zlib
id: cache-zlib
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/zlib-prefix/
key: ${{ runner.os }}-zlib-64-1-2-11-2021-08-09
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/gha.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:

linux:
name: ${{ format('Linux (pattern {0})', matrix.pattern) }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -136,15 +136,15 @@ jobs:

case ${{ matrix.pattern }} in
0)
export CXX="clang++-10"
export CXX="clang++"
export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
;;
1)
export CXX="g++-10"
export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
;;
2)
export CXX="clang++-10"
export CXX="clang++"
export MSGPACK_CXX_VERSION="MSGPACK_CXX14=ON"
;;
3)
Expand All @@ -153,7 +153,7 @@ jobs:
export MSGPACK_USE_STD_VARIANT_ADAPTOR="MSGPACK_USE_STD_VARIANT_ADAPTOR=ON"
;;
4)
export CXX="clang++-10"
export CXX="clang++"
export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
export NO_BOOST="-DMSGPACK_NO_BOOST"
;;
Expand All @@ -162,23 +162,23 @@ jobs:
export ARCH=32
;;
6)
export CXX="clang++-10"
export CXX="clang++"
export API_VERSION=2
;;
7)
export CXX="g++-10"
export API_VERSION=1
;;
8)
export CXX="clang++-10"
export CXX="clang++"
export CHAR_SIGN="unsigned"
;;
9)
export CXX="g++-10"
export X3_PARSE="ON"
;;
10)
export CXX="clang++-10"
export CXX="clang++"
export ACTION="ci/build_regression.sh"
;;
11)
Expand Down
1 change: 0 additions & 1 deletion include/msgpack/v1/adaptor/cpp11/timespec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "msgpack/versioning.hpp"
#include "msgpack/adaptor/adaptor_base.hpp"
#include "msgpack/object.hpp"
#include "msgpack/object.hpp"

#include <ctime>

Expand Down