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.

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

C++ build fixes #207

Merged
merged 18 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 60 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Build and test

on:
workflow_dispatch:
push:
branches: ["main"]
pull_request:
# The branches below must be a subset of the branches above
branches: ["main"]

# See https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
ICE_HOME: ${{ github.workspace }}/ice
PLATFORM: x64

jobs:
ci:
name: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [
ubuntu-22.04,
macos-14,
# windows-2022
]

runs-on: ${{ matrix.os }}
steps:
- name: Checkout Ice
uses: actions/checkout@v4
with:
repository: zeroc-ice/ice
ref: main
path: ice

- name: Setup Ice Build Dependencies
uses: ./ice/.github/actions/setup-dependencies

- name: Build Ice on ${{ matrix.os }}
uses: ./ice/.github/actions/build
timeout-minutes: 90
with:
working_directory: ice

- name: Checkout repository
uses: actions/checkout@v4
with:
path: ice-demos

- name: Build C++ Demos on ${{ matrix.os }}
uses: ./ice/.github/actions/build
timeout-minutes: 30
with:
working_directory: ice-demos/cpp
msbuild_project: \"C++ demos.sln\"
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ locator
publisher
subscriber
talk
chatserver
chatgl2client
chatpollclient

!**/Chat/client/
!**/Chat/server/

!**/msbuild/client
!**/msbuild/server
Expand Down Expand Up @@ -185,8 +191,7 @@ es5
#
# Nuget packages
#
cpp11/packages
cpp98/packages
cpp/packages
csharp/packages

#
Expand Down Expand Up @@ -214,3 +219,6 @@ swift/Carthage
.build
Package.resolved
*.bcsymbolmap

compile_commands.json
.envrc
1 change: 1 addition & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"version": "0.2",
"language": "en",
"words": [
"Blobject",
"icegrid",
"zeroc"
],
Expand Down
Binary file modified certs/cacert.der
Binary file not shown.
34 changes: 17 additions & 17 deletions certs/cacert.pem
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
-----BEGIN CERTIFICATE-----
MIIDyTCCArGgAwIBAgIIeF2eLtdo7XswDQYJKoZIhvcNAQELBQAwgYsxFTATBgNV
BAMMDEljZSBEZW1vcyBDQTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywg
MIID1jCCAr6gAwIBAgIIUmyVFUPQ9f0wDQYJKoZIhvcNAQELBQAwgYsxFTATBgNV
BAMMDEljZSBUZXN0cyBDQTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywg
SW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UE
BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMTIyMzA4
MTQwNVoXDTI0MDMyNzA4MTQwNVowgYsxFTATBgNVBAMMDEljZSBEZW1vcyBDQTEM
BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcyNzEx
MzIxOFoXDTI0MTAyOTExMzIxOFowgYsxFTATBgNVBAMMDEljZSBUZXN0cyBDQTEM
MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
AQEA8IFiB0I2O/sI3AdkrXwdTzHyCCr9Ywm4DG8dtXtTB1tehC1i1Fef0vc7ZSLO
dqukZHaWYzur05p7VxXZmoMAZ0AURbTL7Y3rv2sxAaz6C+HbHpAtYaUZp80c0MCa
ozzHtOtFskGcqNc3fvbAfBWE5T+BxJ5vJizKIp9BysDSYJsWhhN7T9MhGOQJCkbM
mBuAIObCs/nigzdntK8ydQlV4gwVXTNQ0PAmwry5zd89xqCI7yIb4+mc2HS5m45l
qA/jzt21Yb1x7TJCCvsLNkkQXXnFrNM6MHpfkPXG9G8uSuCQVMu6i2r0fN8FjFiH
xzDN9T3R6Scq+OnRwXsQrfnqSQIDAQABoy8wLTAMBgNVHRMEBTADAQH/MB0GA1Ud
DgQWBBStbUgdtOWqtzklzIZw02Dq+666cDANBgkqhkiG9w0BAQsFAAOCAQEAQnCm
CjMeFT14790k2h9z1qyzC1c1KQQP2RAL/glkLQyFXBgjU95M9DnKSQ4u/u9eR7EK
DHuyWG2M5XlUQO1pDQpaf0N3VLCqz21ydgnXes9ttbOzScLZCGulSR0gMFqQ+NUJ
TiPKrZZyZgfWMTkWOi8VdGfIluvL2Ihe277AIX13IjK+4Wt3Aq48GWglVHSv9Gj4
cQuGgrrCqPSdwnJ9QMNwuuNnM1ofSijXvgAKhx462nGSKvRmwdof3+X5oxK7BYfI
kZAmnodnrsPEawzu68K9ZZ75Bv72PyHqUEIept2CzFPfoDBZTffqoy1kA87DsjUi
4L/B/XwCRKspT0aP9Q==
AQEAy6/rqeQ+McDn/mXQwNGk+cNftOIJb99Cdpl4dFuMzD7XBK36l1Ijo/Ro/d03
7ZJr2BzAY/DlseyuvX9qXeQ2jsvzwlumNuEv09ILbCqn27rGt3Gu8RpvSt6ehVic
PXJR3dA/TCZW+iK8WDmDOWtD8DO9jSiN0+qneWixCqWFX5DeBFQoORF3dIjJa62B
LLPaWK1EW01/6R/Las92NKRqXuQ3TkAT1bpsQBjrJFNGSSdwwcteGGpPfzwSw9gW
IuKuS4f0/xZVx6rG9Jzcxm/J2owidhZqqKEvaNiIghMXax6Cldh9Iq2qUS3FS3Ye
T4ZuT/7cEVGu5RPyNnTKgGirhwIDAQABozwwOjAMBgNVHRMEBTADAQH/MB0GA1Ud
DgQWBBQfsKt279iGWWp5DRYKF9f9b/F1+TALBgNVHQ8EBAMCAYYwDQYJKoZIhvcN
AQELBQADggEBAI4qKKqx/edLOQKdcdH+2QAxrmsnZDSMmnlVGl51WBatFw+9GskH
YeIabYdihTx/aDbdoLW5FDVYQQEfBhnvo7uwfhoYR8DapuPFCfeyf5hED+FIpXHo
jVgeL3DrTccPQX3VaCu0ID5FN4EA3Jbp9/Kt+uwQUlHVeMrHQNfo4En/yoJoJowz
26iWrmi2ZdnxuK9WZ0HhENODLp86oNvkgqu9iOR5vJVcJOtKMAiSHmemLOZdaAeM
7UwNTu+cYTC6N2LH31K6qCwJkk3YJg89uCKhd6YkMZvmQlTrnqM39Hg+V8LKl3x/
2iDrWoik199Rh9p/Z1qqitqeOnWK3EzNevA=
-----END CERTIFICATE-----
Binary file modified certs/client.bks
Binary file not shown.
Binary file modified certs/client.jks
Binary file not shown.
Binary file modified certs/client.p12
Binary file not shown.
2 changes: 1 addition & 1 deletion certs/makedemocerts.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Copyright (c) ZeroC, Inc. All rights reserved.
#
Expand Down
Binary file modified certs/server.bks
Binary file not shown.
Binary file modified certs/server.jks
Binary file not shown.
Binary file modified certs/server.p12
Binary file not shown.
28 changes: 28 additions & 0 deletions certs/server.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
-----BEGIN CERTIFICATE-----
MIIExjCCA66gAwIBAgIICIqPq5Tox3swDQYJKoZIhvcNAQELBQAwgYsxFTATBgNV
BAMMDEljZSBUZXN0cyBDQTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywg
SW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UE
BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcyNzEx
MzIxOFoXDTI0MTAyOTExMzIxOFowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEMMAoG
A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
t9yRk/tf1VBy4NOyf546bsc6VVkp2qLMCuJUE8nB7SCOLVMXsXZS5WWVr7P2juDa
HPisBE1eEcUpEvBgFt7KQ4VvbcIKwP/5j/Z1vmT5TTk+EH4ryAlItjaEQpDQJNiu
arymConMZfMu+bJ99D41OChrNzSw5Q/zOg1jTchcv9d9aNE6Jfe5bMKAsSjH1PW3
VKIUGlv7taw4jbwueuAMX9Q8tKk0z/DffJfQ83EJK2y/MVLCLsN/iZh1d2psC2NB
/0u1lOJPg7xPUy4KtIhnoBH+upT9HaT56AxCEEt83ezy/dhksrsutYlNMUSRIRse
H8W9Y0jjt11Ocn1ZgSWr7wIDAQABo4IBLTCCASkwHQYDVR0OBBYEFHxebATdX527
y0pGKgeWQ40uMkgFMIG/BgNVHSMEgbcwgbSAFB+wq3bv2IZZankNFgoX1/1v8XX5
oYGRpIGOMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEU
MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
LmNvbYIIUmyVFUPQ9f0wCwYDVR0PBAQDAgXgMBoGA1UdEQQTMBGHBH8AAAGCCWxv
Y2FsaG9zdDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcN
AQELBQADggEBAJHUGjzNU91OK2ZUdVZPgYOF9i4odGeZ9N8SefRMl/3/Uefj7Kkx
BXZbP1FEKMts9QBAfit0OktmJltxB5+DyARAS6zRH4t0c/wmUm5ml/OOza297aAl
hvW/Q1QlB6WKRMCH9F7AUyRz9uFiaM1cYsZ/I/SltoPCguESZcjqFDZ8fblNcdur
v/c6QECje4YDjZ53vxEjfYtDBpFBG6GQPXBF5BZN47F6Iu/W+kS/OQatkR/8hhEh
CjvZb3AXSr9f9V+uRm9c6yeHz2mfp9jFHIPhCJrYpkPQfSJ2pZfyiD1tzwvOyw5K
x+P/Keu4P/M4IZLHdQiYgSbV9lFe04z5cBo=
-----END CERTIFICATE-----
File renamed without changes.
25 changes: 0 additions & 25 deletions cpp/C++11 Qt demos.sln

This file was deleted.

Loading