Skip to content

chore(server): vcpkg 2026.04.27 #1020

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
asclearuc merged 3 commits into from
Jun 1, 2026
Merged

chore(server): vcpkg 2026.04.27 #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d33e8c
chore(server): vcpkg 2026.04.27
stepmikhaylov May 28, 2026
5a065b8
chore(ci): detect package.json changes
stepmikhaylov May 28, 2026
7809d8a
fix(server): guard AWS Outcome.h against Windows ERROR macro
asclearuc Jun 1, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
- 'builder'
- 'builder.cmd'
- '.github/workflows/**'
- 'package.json'

# ---------------------------------------------------------------------------
# Helm lint + schema validation (only on PRs touching deploy/helm/**)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"license": "MIT",
"vcpkg": {
"version": "2026.02.27"
"version": "2026.04.27"
},
"java": {
"jdkVersion": "17",
Expand Down
8 changes: 8 additions & 0 deletions packages/server/engine-lib/engLib/headers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,20 @@
// https://github.com/aws/aws-sdk-cpp/pull/1189
#pragma push_macro("JSON_USE_EXCEPTION")
#undef JSON_USE_EXCEPTION
// atlbase.h (included above) pulls in wingdi.h, which defines the ERROR macro
// (#define ERROR 0). The newer aws-sdk-cpp declares `typedef E ERROR;` in
// aws/core/utils/Outcome.h, so the macro expands it to `typedef E 0;` and the
// header fails to compile. Suppress the GDI macro across the AWS includes and
// restore it afterwards so Windows code below is unaffected.
#pragma push_macro("ERROR")
#undef ERROR
#include <aws/core/Aws.h>
#include <aws/core/auth/AWSCredentialsProvider.h>
#include <aws/core/http/Scheme.h>
#include <aws/core/utils/memory/stl/AWSSet.h>
#include <aws/core/utils/logging/DefaultLogSystem.h>
#include <aws/core/utils/logging/AWSLogging.h>
#pragma pop_macro("ERROR")
#pragma pop_macro("JSON_USE_EXCEPTION")

#if ROCKETRIDE_PLAT_WIN
Expand Down
Loading