From cd1f1ca0f09312638e8615256f7085135522e3b3 Mon Sep 17 00:00:00 2001 From: Joe George Date: Fri, 19 Jan 2024 11:10:13 -0500 Subject: [PATCH 1/3] Add whitespace validation action (#1697) --- .github/workflows/whitespace.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/whitespace.yml diff --git a/.github/workflows/whitespace.yml b/.github/workflows/whitespace.yml new file mode 100644 index 00000000000..1a42327718d --- /dev/null +++ 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: Whitespace Validation + 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: "'*'" From b26e97f97f6a8180a7bace2b931a6b1703d51c24 Mon Sep 17 00:00:00 2001 From: Joe George Date: Fri, 19 Jan 2024 11:12:28 -0500 Subject: [PATCH 2/3] More whitespace fixes --- slice/Glacier2/Metrics.ice | 3 --- slice/Glacier2/PermissionsVerifier.ice | 4 ---- slice/Glacier2/Router.ice | 3 --- slice/Glacier2/SSLInfo.ice | 4 ---- slice/Glacier2/Session.ice | 4 ---- slice/Ice/BuiltinSequences.ice | 4 ---- slice/Ice/Context.ice | 4 ---- slice/Ice/EndpointTypes.ice | 4 ---- slice/Ice/Identity.ice | 4 ---- slice/Ice/Locator.ice | 4 ---- slice/Ice/Metrics.ice | 3 --- slice/Ice/OperationMode.ice | 4 ---- slice/Ice/Process.ice | 4 ---- slice/Ice/PropertiesAdmin.ice | 4 ---- slice/Ice/PropertyDict.ice | 4 ---- slice/Ice/RemoteLogger.ice | 4 ---- slice/Ice/Router.ice | 4 ---- slice/Ice/Version.ice | 4 ---- slice/IceBox/ServiceManager.ice | 2 -- slice/IceDiscovery/IceDiscovery.ice | 2 -- slice/IceGrid/Admin.ice | 4 ---- slice/IceGrid/Descriptor.ice | 4 ---- slice/IceGrid/Exception.ice | 4 ---- slice/IceGrid/FileParser.ice | 4 ---- slice/IceGrid/Registry.ice | 4 ---- slice/IceGrid/Session.ice | 4 ---- slice/IceGrid/UserAccountMapper.ice | 4 ---- slice/IceLocatorDiscovery/IceLocatorDiscovery.ice | 2 -- slice/IcePatch2/FileInfo.ice | 3 --- slice/IcePatch2/FileServer.ice | 2 -- slice/IceStorm/IceStorm.ice | 3 --- slice/IceStorm/Metrics.ice | 3 --- 32 files changed, 114 deletions(-) diff --git a/slice/Glacier2/Metrics.ice b/slice/Glacier2/Metrics.ice index 8ae3cd5c547..84e9e65c151 100644 --- a/slice/Glacier2/Metrics.ice +++ b/slice/Glacier2/Metrics.ice @@ -13,9 +13,6 @@ [["js:module:ice"]] - - - [["python:pkgdir:Glacier2"]] #include diff --git a/slice/Glacier2/PermissionsVerifier.ice b/slice/Glacier2/PermissionsVerifier.ice index bb7b2b52302..4b9875ad400 100644 --- a/slice/Glacier2/PermissionsVerifier.ice +++ b/slice/Glacier2/PermissionsVerifier.ice @@ -12,16 +12,12 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Glacier2"]] #include [["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 index 0ada14e5b0c..eecf920396f 100644 --- a/slice/Glacier2/Router.ice +++ b/slice/Glacier2/Router.ice @@ -12,9 +12,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Glacier2"]] #include diff --git a/slice/Glacier2/SSLInfo.ice b/slice/Glacier2/SSLInfo.ice index e8e5d7ca413..6750a236660 100644 --- a/slice/Glacier2/SSLInfo.ice +++ b/slice/Glacier2/SSLInfo.ice @@ -12,16 +12,12 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Glacier2"]] #include [["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 index c0dcf99d225..17cd9a61104 100644 --- a/slice/Glacier2/Session.ice +++ b/slice/Glacier2/Session.ice @@ -12,9 +12,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Glacier2"]] #include @@ -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 index dfaa3ac1287..1ff6a4b52ee 100644 --- 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 index 31d8db4d926..60f0cb2f51c 100644 --- 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 index 03e6a9aa914..e3075980b8f 100644 --- 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 index f078ebb2beb..c48d46e82d7 100644 --- 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 index 6b2df390e02..9982d1a3cc7 100644 --- a/slice/Ice/Locator.ice +++ b/slice/Ice/Locator.ice @@ -15,16 +15,12 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Ice"]] #include [["java:package:com.zeroc"]] - module Ice { diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice index 85227e28e9a..c8408d86fcc 100644 --- a/slice/Ice/Metrics.ice +++ b/slice/Ice/Metrics.ice @@ -13,9 +13,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Ice"]] #include diff --git a/slice/Ice/OperationMode.ice b/slice/Ice/OperationMode.ice index 3b9d65e4104..f5d38f70826 100644 --- 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 index 3e01496cd91..f4125beece1 100644 --- 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 index d71642bc56c..81a26fcfffa 100644 --- a/slice/Ice/PropertiesAdmin.ice +++ b/slice/Ice/PropertiesAdmin.ice @@ -13,16 +13,12 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Ice"]] #include [["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 index 9dfd9303371..c5ecc7afb87 100644 --- 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 index 2e9a30f7e07..e08eab0363f 100644 --- 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 index 33c26f8c082..91e6e2ed686 100644 --- a/slice/Ice/Router.ice +++ b/slice/Ice/Router.ice @@ -13,16 +13,12 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:Ice"]] #include [["java:package:com.zeroc"]] - module Ice { diff --git a/slice/Ice/Version.ice b/slice/Ice/Version.ice index c9488800c7f..fb344434b8a 100644 --- 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 index 17f721b73de..f91b0983732 100644 --- a/slice/IceBox/ServiceManager.ice +++ b/slice/IceBox/ServiceManager.ice @@ -14,8 +14,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - [["python:pkgdir:IceBox"]] #include diff --git a/slice/IceDiscovery/IceDiscovery.ice b/slice/IceDiscovery/IceDiscovery.ice index 0cdcdad912b..8ec35eaf0dd 100644 --- a/slice/IceDiscovery/IceDiscovery.ice +++ b/slice/IceDiscovery/IceDiscovery.ice @@ -12,8 +12,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - [["python:pkgdir:IceDiscovery"]] #include diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice index 71d7ee7bd5b..b8d76d47d31 100644 --- a/slice/IceGrid/Admin.ice +++ b/slice/IceGrid/Admin.ice @@ -14,9 +14,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:IceGrid"]] #include @@ -27,7 +24,6 @@ [["java:package:com.zeroc"]] - module IceGrid { diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice index 1fa0f2201fb..54d8b1301db 100644 --- a/slice/IceGrid/Descriptor.ice +++ b/slice/IceGrid/Descriptor.ice @@ -13,14 +13,11 @@ [["js:module:ice"]] [["js:cjs-module"]] - - [["python:pkgdir:IceGrid"]] #ifndef ICE_BUILDING_ICEGRIDDB [["cpp:dll-export:ICEGRID_API"]] - #endif #include @@ -28,7 +25,6 @@ [["java:package:com.zeroc"]] - module IceGrid { diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice index 1b369592dbc..1aedc614802 100644 --- a/slice/IceGrid/Exception.ice +++ b/slice/IceGrid/Exception.ice @@ -13,14 +13,11 @@ [["js:module:ice"]] [["js:cjs-module"]] - - [["python:pkgdir:IceGrid"]] #ifndef ICE_BUILDING_ICEGRIDDB [["cpp:dll-export:ICEGRID_API"]] - #endif #include @@ -28,7 +25,6 @@ [["java:package:com.zeroc"]] - module IceGrid { diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice index 8c77ecd7157..cadc45a0f8d 100644 --- a/slice/IceGrid/FileParser.ice +++ b/slice/IceGrid/FileParser.ice @@ -14,16 +14,12 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:IceGrid"]] #include [["java:package:com.zeroc"]] - module IceGrid { /// This exception is raised if an error occurs during parsing. diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice index 624dc3f30a3..851ea610734 100644 --- a/slice/IceGrid/Registry.ice +++ b/slice/IceGrid/Registry.ice @@ -14,9 +14,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:IceGrid"]] #include @@ -26,7 +23,6 @@ [["java:package:com.zeroc"]] - module IceGrid { /// Determines which load sampling interval to use. diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice index bb53b2df020..e449dfe297e 100644 --- a/slice/IceGrid/Session.ice +++ b/slice/IceGrid/Session.ice @@ -14,9 +14,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:IceGrid"]] #include @@ -24,7 +21,6 @@ [["java:package:com.zeroc"]] - module IceGrid { /// A session object is used by IceGrid clients to allocate and release objects. Client sessions are created either diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice index f921c6dc844..f18bd55115a 100644 --- a/slice/IceGrid/UserAccountMapper.ice +++ b/slice/IceGrid/UserAccountMapper.ice @@ -14,14 +14,10 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:IceGrid"]] [["java:package:com.zeroc"]] - module IceGrid { /// This exception is raised if a user account for a given session identifier can't be found. diff --git a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice index 6cbdd4f523c..5ff37b02c99 100644 --- a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +++ b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice @@ -12,8 +12,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - [["python:pkgdir:IceLocatorDiscovery"]] #include diff --git a/slice/IcePatch2/FileInfo.ice b/slice/IcePatch2/FileInfo.ice index 46a4871a1ba..9d30fc2b7cf 100644 --- a/slice/IcePatch2/FileInfo.ice +++ b/slice/IcePatch2/FileInfo.ice @@ -14,15 +14,12 @@ [["js:module:ice"]] [["js:cjs-module"]] - - [["python:pkgdir:IcePatch2"]] #include [["java:package:com.zeroc"]] - module IcePatch2 { diff --git a/slice/IcePatch2/FileServer.ice b/slice/IcePatch2/FileServer.ice index b79ffdbc9a2..f611ed56493 100644 --- a/slice/IcePatch2/FileServer.ice +++ b/slice/IcePatch2/FileServer.ice @@ -14,8 +14,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - [["python:pkgdir:IcePatch2"]] #include diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice index 560f20876e1..de2ba05f521 100644 --- a/slice/IceStorm/IceStorm.ice +++ b/slice/IceStorm/IceStorm.ice @@ -14,9 +14,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:IceStorm"]] #include diff --git a/slice/IceStorm/Metrics.ice b/slice/IceStorm/Metrics.ice index 7ed551cd5c5..5ce4463c605 100644 --- a/slice/IceStorm/Metrics.ice +++ b/slice/IceStorm/Metrics.ice @@ -14,9 +14,6 @@ [["js:module:ice"]] [["js:cjs-module"]] - - - [["python:pkgdir:IceStorm"]] #include From efd4d6c0271220f6f73bd17509180283f538d6f4 Mon Sep 17 00:00:00 2001 From: Joe George Date: Fri, 19 Jan 2024 11:31:34 -0500 Subject: [PATCH 3/3] Update workflow names --- .github/workflows/ci.yml | 2 +- .github/workflows/whitespace.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4eb6610f923..009a2e4cf8f 100644 --- 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 index 1a42327718d..ff2548a08d7 100644 --- a/.github/workflows/whitespace.yml +++ b/.github/workflows/whitespace.yml @@ -1,4 +1,4 @@ -name: Whitespace Validation +name: Whitespace validation on: workflow_dispatch: @@ -10,7 +10,7 @@ on: jobs: whitespace-validation: - name: Whitespace Validation + name: Validate trailing whitespace and consecutive empty lines runs-on: ubuntu-latest steps: - name: Checkout repository