From 7409f297f10f4751e208bbec21910e4211c600ad Mon Sep 17 00:00:00 2001
From: Joe George <joe@zeroc.com>
Date: Tue, 28 May 2024 12:07:35 -0400
Subject: [PATCH] Fixe

---
 .github/workflows/ci.yml           | 17 +++++++++++++++--
 .gitignore                         |  6 ++++--
 cpp/Chat/server/ChatSessionI.cpp   |  2 --
 cpp/Glacier2/callback/Client.cpp   |  2 +-
 cpp/Glacier2/simpleChat/Client.cpp |  2 +-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48979ca54..9fca09762 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,13 +13,16 @@ concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  ICE_HOME: ${{ github.workspace }}/ice
+
 jobs:
   ci:
     name: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-22.04, macos-14, windows-2022]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -37,7 +40,8 @@ jobs:
         uses: ./ice/.github/actions/build
         timeout-minutes: 90
         with:
-          working_directory: ice/cpp
+          working_directory: ice
+          build_flags: srcs
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -50,3 +54,12 @@ jobs:
         run: |
           export ICE_HOME=$GITHUB_WORKSPACE/ice
           make
+        if: ${{ runner.os != 'Windows' }}
+
+      - name: Build Ice Demos on ${{ matrix.os }}
+        timeout-minutes: 90
+        working-directory: ice-demos/cpp
+        run: |
+          export ICE_HOME=$GITHUB_WORKSPACE/ice
+          make
+        if: ${{ runner.os == 'Windows' }}
diff --git a/.gitignore b/.gitignore
index 877862daa..9945c77f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,11 @@ publisher
 subscriber
 talk
 chatserver
+chatgl2client
+chatpollclient
 
-!Chat/client/
-!Chat/server/
+!**/Chat/client/
+!**/Chat/server/
 
 !**/msbuild/client
 !**/msbuild/server
diff --git a/cpp/Chat/server/ChatSessionI.cpp b/cpp/Chat/server/ChatSessionI.cpp
index 42ae9a981..6ad761370 100644
--- a/cpp/Chat/server/ChatSessionI.cpp
+++ b/cpp/Chat/server/ChatSessionI.cpp
@@ -131,8 +131,6 @@ ChatSessionI::setCallback(optional<Chat::ChatRoomCallbackPrx> callback, const Ic
         return;
     }
 
-    callback->ice_ping();
-
     Ice::Context ctx;
     ctx["_fwd"] = "o";
     _callback = make_shared<SessionCallbackAdapter>(
diff --git a/cpp/Glacier2/callback/Client.cpp b/cpp/Glacier2/callback/Client.cpp
index dc9058e60..0fe581074 100644
--- a/cpp/Glacier2/callback/Client.cpp
+++ b/cpp/Glacier2/callback/Client.cpp
@@ -65,7 +65,7 @@ run(const shared_ptr<Ice::Communicator>& communicator)
     if (!defaultRouter)
     {
         cerr << "no router configured" << endl;
-        return;
+        exit(1);
     }
     const Glacier2::RouterPrx router = Glacier2::RouterPrx(*communicator->getDefaultRouter());
 
diff --git a/cpp/Glacier2/simpleChat/Client.cpp b/cpp/Glacier2/simpleChat/Client.cpp
index 21bc05b92..6d6ab01e6 100644
--- a/cpp/Glacier2/simpleChat/Client.cpp
+++ b/cpp/Glacier2/simpleChat/Client.cpp
@@ -73,7 +73,7 @@ run(const shared_ptr<Ice::Communicator>& communicator)
     if (!defaultRouter)
     {
         cerr << "no router configured" << endl;
-        return;
+        exit(1);
     }
     const Glacier2::RouterPrx router = Glacier2::RouterPrx(*communicator->getDefaultRouter());
     optional<ChatSessionPrx> session;