Fix the hack, hope the test still passes

pull/21271/head
Lidi Zheng 5 years ago
parent c89892ded5
commit ed054d03a1
  1. 5
      tools/internal_ci/helper_scripts/install_python38.ps1
  2. 7
      tools/internal_ci/windows/grpc_build_artifacts.bat
  3. 6
      tools/internal_ci/windows/grpc_build_packages.bat
  4. 6
      tools/internal_ci/windows/grpc_distribtests.bat
  5. 6
      tools/internal_ci/windows/grpc_distribtests_standalone.bat
  6. 10
      tools/run_tests/artifacts/artifact_targets.py

@ -50,13 +50,10 @@ function Install-Python {
Write-Host "Python $PythonVersion installed by $PythonInstaller at $PythonInstallPath."
}
# NOTE(lidiz) Even though the default install folder for Python 32 bit is using
# "bit", but seems there is a hack in "grpc_build_artifacts.bat" that renames
# all "32bit" into "32bits".
$Python38x86Config = @{
PythonVersion = "3.8.0"
PythonInstaller = "python-3.8.0.exe"
PythonInstallPath = "C:\Python38_32bits"
PythonInstallPath = "C:\Python38_32bit"
PythonInstallerHash = "412a649d36626d33b8ca5593cf18318c"
}
Install-Python @Python38x86Config

@ -12,13 +12,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
@rem TODO(jtattermusch): get rid of this hack
rename C:\Python27_32bit Python27_32bits
rename C:\Python35_32bit Python35_32bits
rename C:\Python36_32bit Python36_32bits
rename C:\Python37_32bit Python37_32bits
@rem Boringssl build no longer supports yasm
choco uninstall yasm -y --limit-output
choco install nasm -y --limit-output

@ -12,12 +12,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
@rem TODO(jtattermusch): get rid of this hack
rename C:\Python27_32bit Python27_32bits
rename C:\Python35_32bit Python35_32bits
rename C:\Python36_32bit Python36_32bits
@rem enter repo root
cd /d %~dp0\..\..\..

@ -12,12 +12,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
@rem TODO(jtattermusch): get rid of this hack
rename C:\Python27_32bit Python27_32bits
rename C:\Python35_32bit Python35_32bits
rename C:\Python36_32bit Python36_32bits
@rem enter repo root
cd /d %~dp0\..\..\..

@ -12,12 +12,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
@rem TODO(jtattermusch): get rid of this hack
rename C:\Python27_32bit Python27_32bits
rename C:\Python35_32bit Python35_32bits
rename C:\Python36_32bit Python36_32bits
@rem enter repo root
cd /d %~dp0\..\..\..

@ -408,11 +408,11 @@ def targets():
PythonArtifact('macos', 'x64', 'python3.7'),
# TODO(https://github.com/grpc/grpc/issues/20615) Enable this artifact
# PythonArtifact('macos', 'x64', 'python3.8'),
PythonArtifact('windows', 'x86', 'Python27_32bits'),
PythonArtifact('windows', 'x86', 'Python35_32bits'),
PythonArtifact('windows', 'x86', 'Python36_32bits'),
PythonArtifact('windows', 'x86', 'Python37_32bits'),
PythonArtifact('windows', 'x86', 'Python38_32bits'),
PythonArtifact('windows', 'x86', 'Python27_32bit'),
PythonArtifact('windows', 'x86', 'Python35_32bit'),
PythonArtifact('windows', 'x86', 'Python36_32bit'),
PythonArtifact('windows', 'x86', 'Python37_32bit'),
PythonArtifact('windows', 'x86', 'Python38_32bit'),
PythonArtifact('windows', 'x64', 'Python27'),
PythonArtifact('windows', 'x64', 'Python35'),
PythonArtifact('windows', 'x64', 'Python36'),

Loading…
Cancel
Save