From 83ee476c596e5f723151b693eccb112fa32d0089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Wed, 17 Apr 2024 12:36:26 +0200 Subject: [PATCH 1/3] Add grpc, grpc plugins for bigrquerystorage package Closes https://github.com/meztez/bigrquerystorage/issues/49 --- rules/grpcpp.json | 77 ++++++++++++++++++++++++++++++++++++++++ rules/protobuf-grpc.json | 77 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 rules/grpcpp.json create mode 100644 rules/protobuf-grpc.json diff --git a/rules/grpcpp.json b/rules/grpcpp.json new file mode 100644 index 0000000..ce8153d --- /dev/null +++ b/rules/grpcpp.json @@ -0,0 +1,77 @@ +{ + "patterns": ["\\blibgrpc\\+\\+"], + "dependencies": [ + { + "packages": ["libgrpc++-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "destribution": "debian" + } + ] + }, + { + "packages": ["grpc-devel", "pkgconf"], + "constraints": [ + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "pre_install": [ + { "command": "yum install -y epel-release" }, + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled crb" } + ], + "packages": ["grpc-devel", "pkgconf"], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "version": ["9"] + } + ] + }, + { + "packages": ["grpc-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "sle" + } + ] + }, + { + "packages": ["grpc-devel", "pkgconf"], + "pre_install": [ + { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "redhat", + "versions": ["9"] + } + ] + }, + { + "packages": ["grpc-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine" + } + ] + } + ] +} diff --git a/rules/protobuf-grpc.json b/rules/protobuf-grpc.json new file mode 100644 index 0000000..a06f2b6 --- /dev/null +++ b/rules/protobuf-grpc.json @@ -0,0 +1,77 @@ +{ + "patterns": ["\\bgrpc/protobuf\\b"], + "dependencies": [ + { + "packages": ["protobuf-compiler-grpc"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "destribution": "debian" + } + ] + }, + { + "packages": ["grpc-plugins"], + "constraints": [ + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "pre_install": [ + { "command": "yum install -y epel-release" }, + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled crb" } + ], + "packages": ["grpc-plugins"], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "version": ["9"] + } + ] + }, + { + "packages": ["grpc-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "sle" + } + ] + }, + { + "packages": ["grpc-plugins"], + "pre_install": [ + { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "redhat", + "versions": ["9"] + } + ] + }, + { + "packages": ["grpc-plugins"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine" + } + ] + } + ] +} From 26282b74f059cc2beb19bc5d710c3360a4e42177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Wed, 17 Apr 2024 12:43:56 +0200 Subject: [PATCH 2/3] Fix typos --- rules/grpcpp.json | 4 ++-- rules/protobuf-grpc.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/grpcpp.json b/rules/grpcpp.json index ce8153d..5102cdc 100644 --- a/rules/grpcpp.json +++ b/rules/grpcpp.json @@ -10,7 +10,7 @@ }, { "os": "linux", - "destribution": "debian" + "distribution": "debian" } ] }, @@ -34,7 +34,7 @@ { "os": "linux", "distribution": "rockylinux", - "version": ["9"] + "versions": ["9"] } ] }, diff --git a/rules/protobuf-grpc.json b/rules/protobuf-grpc.json index a06f2b6..e143803 100644 --- a/rules/protobuf-grpc.json +++ b/rules/protobuf-grpc.json @@ -10,7 +10,7 @@ }, { "os": "linux", - "destribution": "debian" + "distribution": "debian" } ] }, @@ -34,7 +34,7 @@ { "os": "linux", "distribution": "rockylinux", - "version": ["9"] + "versions": ["9"] } ] }, From 5a9f40816991113ddd970e1dde1e24551e9ec942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Wed, 17 Apr 2024 15:38:23 +0200 Subject: [PATCH 3/3] Fix protobuf-grpc for Alpine 3.16 --- rules/protobuf-grpc.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/rules/protobuf-grpc.json b/rules/protobuf-grpc.json index e143803..11e6e25 100644 --- a/rules/protobuf-grpc.json +++ b/rules/protobuf-grpc.json @@ -69,7 +69,18 @@ "constraints": [ { "os": "linux", - "distribution": "alpine" + "distribution": "alpine", + "versions": ["3.17", "3.18", "3.19", "edge"] + } + ] + }, + { + "packages": ["grpc-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine", + "versions": ["3.16"] } ] }