Merge branch 'main' into python-autopep8

zeroc-ice · Jan 19, 2024 · 482f585 · 482f585
2 parents 7f2d5ec + efd4d6c
commit 482f585
Show file tree

Hide file tree

Showing 34 changed files with 23 additions and 115 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: ci
+name: Build and test
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/whitespace.yml b/.github/workflows/whitespace.yml
@@ -0,0 +1,22 @@
+name: Whitespace validation
+
+on:
+  workflow_dispatch:
+  push:
+    branches: ["main"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ["main"]
+
+jobs:
+  whitespace-validation:
+    name: Validate trailing whitespace and consecutive empty lines
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Run whitespace validation
+        uses: zeroc-ice/github-actions/@main
+        with:
+          whitespace_patterns: "'*'"
diff --git a/slice/Glacier2/Metrics.ice b/slice/Glacier2/Metrics.ice
@@ -13,9 +13,6 @@
 
 [["js:module:ice"]]
 
-
-
-
 [["python:pkgdir:Glacier2"]]
 
 #include <Ice/Metrics.ice>

diff --git a/slice/Glacier2/PermissionsVerifier.ice b/slice/Glacier2/PermissionsVerifier.ice
@@ -12,16 +12,12 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Glacier2"]]
 
 #include <Glacier2/SSLInfo.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module Glacier2
 {
     /// This exception is raised if a client is denied the ability to create a session with the router.

diff --git a/slice/Glacier2/Router.ice b/slice/Glacier2/Router.ice
@@ -12,9 +12,6 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Glacier2"]]
 
 #include <Ice/Router.ice>

diff --git a/slice/Glacier2/SSLInfo.ice b/slice/Glacier2/SSLInfo.ice
@@ -12,16 +12,12 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Glacier2"]]
 
 #include <Ice/BuiltinSequences.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module Glacier2
 {
     /// Information taken from an SSL connection used for permissions verification.

diff --git a/slice/Glacier2/Session.ice b/slice/Glacier2/Session.ice
@@ -12,9 +12,6 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Glacier2"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -23,7 +20,6 @@
 
 [["java:package:com.zeroc"]]
 
-
 module Glacier2
 {
     /// This exception is raised if an attempt to create a new session failed.

diff --git a/slice/Ice/BuiltinSequences.ice b/slice/Ice/BuiltinSequences.ice
@@ -19,14 +19,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
     /// A sequence of bools.

diff --git a/slice/Ice/Context.ice b/slice/Ice/Context.ice
@@ -16,14 +16,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
 

diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice
@@ -16,14 +16,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
 

diff --git a/slice/Ice/Identity.ice b/slice/Ice/Identity.ice
@@ -18,14 +18,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
 

diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice
@@ -15,16 +15,12 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 #include <Ice/Identity.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
 

diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice
@@ -13,9 +13,6 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 #include <Ice/BuiltinSequences.ice>

diff --git a/slice/Ice/OperationMode.ice b/slice/Ice/OperationMode.ice
@@ -17,14 +17,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
 

diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice
@@ -13,14 +13,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
     /// An administrative interface for process management. Managed servers must implement this interface.

diff --git a/slice/Ice/PropertiesAdmin.ice b/slice/Ice/PropertiesAdmin.ice
@@ -13,16 +13,12 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 #include <Ice/PropertyDict.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
     /// The PropertiesAdmin interface provides remote access to the properties of a communicator.

diff --git a/slice/Ice/PropertyDict.ice b/slice/Ice/PropertyDict.ice
@@ -16,14 +16,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
     /// A simple collection of properties, represented as a dictionary of key/value pairs. Both key and value are

diff --git a/slice/Ice/RemoteLogger.ice b/slice/Ice/RemoteLogger.ice
@@ -16,14 +16,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
     /// An enumeration representing the different types of log messages.

diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice
@@ -13,16 +13,12 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
 

diff --git a/slice/Ice/Version.ice b/slice/Ice/Version.ice
@@ -18,14 +18,10 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:Ice"]]
 
 [["java:package:com.zeroc"]]
 
-
 module Ice
 {
 

diff --git a/slice/IceBox/ServiceManager.ice b/slice/IceBox/ServiceManager.ice
@@ -14,8 +14,6 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
 [["python:pkgdir:IceBox"]]
 
 #include <Ice/BuiltinSequences.ice>

diff --git a/slice/IceDiscovery/IceDiscovery.ice b/slice/IceDiscovery/IceDiscovery.ice
@@ -12,8 +12,6 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
 [["python:pkgdir:IceDiscovery"]]
 
 #include <Ice/Identity.ice>

diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
@@ -14,9 +14,6 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:IceGrid"]]
 
 #include <Ice/Identity.ice>
@@ -27,7 +24,6 @@
 
 [["java:package:com.zeroc"]]
 
-
 module IceGrid
 {
 

diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice
@@ -13,22 +13,18 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
 [["python:pkgdir:IceGrid"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
 [["cpp:dll-export:ICEGRID_API"]]
 
-
 #endif
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module IceGrid
 {
 

diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice
@@ -13,22 +13,18 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
 [["python:pkgdir:IceGrid"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
 [["cpp:dll-export:ICEGRID_API"]]
 
-
 #endif
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module IceGrid
 {
 

diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice
@@ -14,16 +14,12 @@
 [["js:module:ice"]]
 [["js:cjs-module"]]
 
-
-
-
 [["python:pkgdir:IceGrid"]]
 
 #include <IceGrid/Admin.ice>
 
 [["java:package:com.zeroc"]]
 
-
 module IceGrid
 {
     /// This exception is raised if an error occurs during parsing.