From fbde7d37860fb95c775bc0d2e5d0fb1562f9bde1 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 10 Aug 2018 11:29:21 -0700 Subject: No need to build artifact for PHP MacOS --- tools/run_tests/artifacts/artifact_targets.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index a37098d9bf..ef40c901b2 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -295,10 +295,6 @@ class PHPArtifact: self.name, 'tools/dockerfile/grpc_artifact_linux_{}'.format( self.arch), 'tools/run_tests/artifacts/build_artifact_php.sh') - else: - return create_jobspec( - self.name, ['tools/run_tests/artifacts/build_artifact_php.sh'], - use_workspace=True) class ProtocArtifact: @@ -400,6 +396,5 @@ def targets(): PythonArtifact('windows', 'x64', 'Python37'), RubyArtifact('linux', 'x64'), RubyArtifact('macos', 'x64'), - PHPArtifact('linux', 'x64'), - PHPArtifact('macos', 'x64') + PHPArtifact('linux', 'x64') ]) -- cgit v1.2.3 From 54e7b24b9a167cea766b03c8e559075ee7809927 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 10 Aug 2018 13:44:38 -0700 Subject: Remove if clause too --- tools/run_tests/artifacts/artifact_targets.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index ef40c901b2..34846202b8 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -290,11 +290,10 @@ class PHPArtifact: return [] def build_jobspec(self): - if self.platform == 'linux': - return create_docker_jobspec( - self.name, 'tools/dockerfile/grpc_artifact_linux_{}'.format( - self.arch), - 'tools/run_tests/artifacts/build_artifact_php.sh') + return create_docker_jobspec( + self.name, 'tools/dockerfile/grpc_artifact_linux_{}'.format( + self.arch), + 'tools/run_tests/artifacts/build_artifact_php.sh') class ProtocArtifact: -- cgit v1.2.3 From 9993869d042c59b79bac11c45f4c58ace5dbeccd Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 10 Aug 2018 14:37:09 -0700 Subject: lint fix --- tools/run_tests/artifacts/artifact_targets.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index 34846202b8..bdeb258e1f 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -292,8 +292,7 @@ class PHPArtifact: def build_jobspec(self): return create_docker_jobspec( self.name, 'tools/dockerfile/grpc_artifact_linux_{}'.format( - self.arch), - 'tools/run_tests/artifacts/build_artifact_php.sh') + self.arch), 'tools/run_tests/artifacts/build_artifact_php.sh') class ProtocArtifact: -- cgit v1.2.3