Skip to content

Commit ecf7020

Browse files
Merge pull request #63 from wep21/vs2022
ci: update vs2019 to vs2022
2 parents 393a104 + 45f94e1 commit ecf7020

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

.github/workflows/testpr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- os: macos-14
2626
platform: osx-arm64
2727
additional_recipes: []
28-
- os: windows-2019
28+
- os: windows-2022
2929
platform: win-64
3030
additional_recipes: []
3131

conda_build_config.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ python_impl:
2828
c_compiler:
2929
- gcc # [linux]
3030
- clang # [osx]
31-
- vs2019 # [win and x86_64]
32-
- vs2022 # [win and arm64]
31+
- vs2022 # [win]
3332
c_compiler_version: # [unix]
3433
- 13 # [linux]
3534
- 18 # [osx]
@@ -44,8 +43,7 @@ c_stdlib_version: # [unix]
4443
cxx_compiler:
4544
- gxx # [linux]
4645
- clangxx # [osx]
47-
- vs2019 # [win and x86_64]
48-
- vs2022 # [win and arm64]
46+
- vs2022 # [win]
4947
cxx_compiler_version: # [unix]
5048
- 13 # [linux]
5149
- 18 # [osx]

patch/ros-jazzy-iceoryx-hoofs.win.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,15 @@ index f7cb43b..115964a 100644
1111
endif()
1212

1313
set(PREFIX iceoryx/v${CMAKE_PROJECT_VERSION})
14+
diff --git a/platform/win/source/time.cpp b/platform/win/source/time.cpp
15+
index 4c2ab2d..4a7074b 100644
16+
--- a/platform/win/source/time.cpp
17+
+++ b/platform/win/source/time.cpp
18+
@@ -16,6 +16,7 @@
19+
// SPDX-License-Identifier: Apache-2.0
20+
21+
#include "iceoryx_hoofs/platform/time.hpp"
22+
+#include <chrono>
23+
24+
static std::chrono::nanoseconds getNanoSeconds(const timespec& value)
25+
{

pixi.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ git = "*"
2626

2727
[feature.beta.pypi-dependencies]
2828
# This is tipically the latest commit on main branch
29-
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "cbb8eba834ce3834df552977d6b08c325a30768e" }
29+
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "89e3fda78f32023c77481bd8f64a7030a4c72fc8" }
3030
# Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
3131
# (and regenerate the pixi.lock) once you push the modified commit to the repo
3232
#vinca = { path = "../vinca", editable = true }

0 commit comments

Comments
 (0)