dynamically create plugin tests

grpc · Jan 23, 2025 · e2d4cab · e2d4cab
1 parent 3c5b627
commit e2d4cab
Show file tree

Hide file tree

Showing 41 changed files with 152 additions and 734 deletions.
diff --git a/.github/workflows/matrices/plugin-tests.json b/.github/workflows/matrices/plugin-tests.json
@@ -1 +1 @@
-{"config":[{"name":"Plugin tests (6.0)","swift_version":"6.0","runner":"ubuntu-latest","image":"swift:6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-6.1)","swift_version":"nightly-6.1","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-6.1-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-main)","swift_version":"nightly-main","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-main-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""}]}
+{"config":[{"name":"Plugin tests (6.0)","swift_version":"6.0","runner":"ubuntu-latest","image":"swift:6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s http://raw.githubusercontent.com/grpc/grpc-swift-protobuf/main/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-6.1)","swift_version":"nightly-6.1","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-6.1-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s http://raw.githubusercontent.com/grpc/grpc-swift-protobuf/main/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-main)","swift_version":"nightly-main","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-main-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s http://raw.githubusercontent.com/grpc/grpc-swift-protobuf/main/dev/plugin-tests.sh | bash","command_arguments":""}]}
diff --git a/IntegrationTests/PluginTests/Resources/Foo/foo-messages.proto b/IntegrationTests/PluginTests/Resources/Foo/foo-messages.proto
@@ -0,0 +1,7 @@
+// Leading trivia.
+syntax = "proto3";
+
+package foo;
+
+message FooInput {}
+message FooOutput {}
diff --git a/...ions/Sources/Protos/Foo/foo-service.proto → ...uginTests/Resources/Foo/foo-service.proto b/...ions/Sources/Protos/Foo/foo-service.proto → ...uginTests/Resources/Foo/foo-service.proto
diff --git a/..._05_two_definitions/Sources/adopter.swift → ...ests/Resources/FooHelloWorldAdopter.swift b/..._05_two_definitions/Sources/adopter.swift → ...ests/Resources/FooHelloWorldAdopter.swift
diff --git a/...nfig_file/Sources/Protos/HelloWorld.proto → ...sts/Resources/HelloWorld/HelloWorld.proto b/...nfig_file/Sources/Protos/HelloWorld.proto → ...sts/Resources/HelloWorld/HelloWorld.proto
diff --git a/...sage_protos/Sources/Protos/Messages.proto → ...Tests/Resources/HelloWorld/Messages.proto b/...sage_protos/Sources/Protos/Messages.proto → ...Tests/Resources/HelloWorld/Messages.proto
diff --git a/...ssage_protos/Sources/Protos/Service.proto → ...nTests/Resources/HelloWorld/Service.proto b/...ssage_protos/Sources/Protos/Service.proto → ...nTests/Resources/HelloWorld/Service.proto
diff --git a/...p_level_config_file/Sources/adopter.swift → ...inTests/Resources/HelloWorldAdopter.swift b/...p_level_config_file/Sources/adopter.swift → ...inTests/Resources/HelloWorldAdopter.swift
diff --git a/...rate_service_message_protos/Package.swift → ...Tests/PluginTests/Resources/Package.swift b/...rate_service_message_protos/Package.swift → ...Tests/PluginTests/Resources/Package.swift
@@ -17,7 +17,7 @@
 
 import PackageDescription
 
-let package = Package(
+var package = Package(
   name: "grpc-adopter",
   platforms: [
     .macOS(.v15),
@@ -27,12 +27,11 @@ let package = Package(
     .visionOS(.v2),
   ],
   dependencies: [
-    .package(
-      path: "../../../../grpc-swift-protobuf"
-    ),
+    // Dependency on grpc-swift-protobuf to be added by setup-plugin-tests.sh script
+
     .package(
       url: "https://github.com/grpc/grpc-swift.git",
-      exact: "2.0.0-beta.3"
+      branch: "main"
     ),
   ],
   targets: [

diff --git a/..._2/grpc-swift-proto-generator-config.json → ...-1-grpc-swift-proto-generator-config.json b/..._2/grpc-swift-proto-generator-config.json → ...-1-grpc-swift-proto-generator-config.json
diff --git a/...es/grpc-swift-proto-generator-config.json → ...al-grpc-swift-proto-generator-config.json b/...es/grpc-swift-proto-generator-config.json → ...al-grpc-swift-proto-generator-config.json
diff --git a/...ns/grpc-swift-proto-generator-config.json → ...ic-grpc-swift-proto-generator-config.json b/...ns/grpc-swift-proto-generator-config.json → ...ic-grpc-swift-proto-generator-config.json
diff --git a/IntegrationTests/PluginTests/test_01_top_level_config_file/.gitignore b/IntegrationTests/PluginTests/test_01_top_level_config_file/.gitignore
diff --git a/IntegrationTests/PluginTests/test_01_top_level_config_file/Package.swift b/IntegrationTests/PluginTests/test_01_top_level_config_file/Package.swift
diff --git a/IntegrationTests/PluginTests/test_02_peer_config_file/.gitignore b/IntegrationTests/PluginTests/test_02_peer_config_file/.gitignore
diff --git a/IntegrationTests/PluginTests/test_02_peer_config_file/Package.swift b/IntegrationTests/PluginTests/test_02_peer_config_file/Package.swift
diff --git a/IntegrationTests/PluginTests/test_02_peer_config_file/Sources/Protos/HelloWorld.proto b/IntegrationTests/PluginTests/test_02_peer_config_file/Sources/Protos/HelloWorld.proto
diff --git a/...luginTests/test_02_peer_config_file/Sources/Protos/grpc-swift-proto-generator-config.json b/...luginTests/test_02_peer_config_file/Sources/Protos/grpc-swift-proto-generator-config.json
diff --git a/IntegrationTests/PluginTests/test_02_peer_config_file/Sources/adopter.swift b/IntegrationTests/PluginTests/test_02_peer_config_file/Sources/adopter.swift
diff --git a/IntegrationTests/PluginTests/test_03_separate_service_message_protos/.gitignore b/IntegrationTests/PluginTests/test_03_separate_service_message_protos/.gitignore
diff --git a/..._03_separate_service_message_protos/Sources/Protos/grpc-swift-proto-generator-config.json b/..._03_separate_service_message_protos/Sources/Protos/grpc-swift-proto-generator-config.json
diff --git a/IntegrationTests/PluginTests/test_03_separate_service_message_protos/Sources/adopter.swift b/IntegrationTests/PluginTests/test_03_separate_service_message_protos/Sources/adopter.swift
diff --git a/IntegrationTests/PluginTests/test_04_cross_directory_imports/.gitignore b/IntegrationTests/PluginTests/test_04_cross_directory_imports/.gitignore
diff --git a/IntegrationTests/PluginTests/test_04_cross_directory_imports/Package.swift b/IntegrationTests/PluginTests/test_04_cross_directory_imports/Package.swift
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"config":[{"name":"Plugin tests (6.0)","swift_version":"6.0","runner":"ubuntu-latest","image":"swift:6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh \| bash","command_arguments":""},{"name":"Plugin tests (nightly-6.1)","swift_version":"nightly-6.1","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-6.1-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh \| bash","command_arguments":""},{"name":"Plugin tests (nightly-main)","swift_version":"nightly-main","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-main-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh \| bash","command_arguments":""}]}
		{"config":[{"name":"Plugin tests (6.0)","swift_version":"6.0","runner":"ubuntu-latest","image":"swift:6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s http://raw.githubusercontent.com/grpc/grpc-swift-protobuf/main/dev/plugin-tests.sh \| bash","command_arguments":""},{"name":"Plugin tests (nightly-6.1)","swift_version":"nightly-6.1","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-6.1-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s http://raw.githubusercontent.com/grpc/grpc-swift-protobuf/main/dev/plugin-tests.sh \| bash","command_arguments":""},{"name":"Plugin tests (nightly-main)","swift_version":"nightly-main","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-main-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s http://raw.githubusercontent.com/grpc/grpc-swift-protobuf/main/dev/plugin-tests.sh \| bash","command_arguments":""}]}