Updated CI to build 3.8.17

DataDog · Jun 21, 2023 · 7a2b527 · 7a2b527
1 parent 1d743c6
commit 7a2b527
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -18,11 +18,11 @@ stages:
     - if (Test-Path build-out) { remove-item -recurse -force build-out }
     - docker run --rm -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID} -e WINDOWS_BUILDER=true -e AWS_NETWORKING=true -e TARGET_ARCH="$ARCH" datadog/agent-buildimages-windows_x64:1809 C:\mnt\build.bat
     - get-childitem build-out
-    - Get-FileHash -Algorithm SHA256 build-out/python-windows-3.8.16-${ARCH}.zip
+    - Get-FileHash -Algorithm SHA256 build-out/python-windows-3.8.17-${ARCH}.zip
   artifacts:
     expire_in: 2 weeks
     paths:
-      - build-out/python-windows-3.8.16-${ARCH}.zip
+      - build-out/python-windows-3.8.17-${ARCH}.zip
 
 build_binaries_x64:
   extends: .build_common
@@ -42,8 +42,8 @@ deploy_x64:
     !reference [.manual]
   script:
     - $hash = (git rev-parse --short HEAD 2> $null)
-    - Write-Host "Uploading zip python-windows-3.8.16-${hash}-x64.zip"
-    - Invoke-Expression "aws s3 cp --only-show-errors --region us-east-1 --sse AES256 --acl public-read build-out/python-windows-3.8.16-x64.zip s3://dd-agent-omnibus/python-windows-3.8.16-${hash}-x64.zip"
+    - Write-Host "Uploading zip python-windows-3.8.17-${hash}-x64.zip"
+    - Invoke-Expression "aws s3 cp --only-show-errors --region us-east-1 --sse AES256 --acl public-read build-out/python-windows-3.8.17-x64.zip s3://dd-agent-omnibus/python-windows-3.8.17-${hash}-x64.zip"
 
 deploy_x86:
   stage: deploy
@@ -53,5 +53,5 @@ deploy_x86:
     !reference [.manual]
   script:
     - $hash = (git rev-parse --short HEAD 2> $null)
-    - Write-Host "Uploading zip python-windows-3.8.16-${hash}-x86.zip"
-    - Invoke-Expression "aws s3 cp --only-show-errors --region us-east-1 --sse AES256 --acl public-read build-out/python-windows-3.8.16-x86.zip s3://dd-agent-omnibus/python-windows-3.8.16-${hash}-x86.zip"
+    - Write-Host "Uploading zip python-windows-3.8.17-${hash}-x86.zip"
+    - Invoke-Expression "aws s3 cp --only-show-errors --region us-east-1 --sse AES256 --acl public-read build-out/python-windows-3.8.17-x86.zip s3://dd-agent-omnibus/python-windows-3.8.17-${hash}-x86.zip"
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
@@ -23,7 +23,7 @@
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.8.17+"
+#define PY_VERSION              "3.8.17"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

diff --git a/PCbuild/python.props b/PCbuild/python.props
@@ -67,8 +67,8 @@
     <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
     <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
-    <opensslDir>$(ExternalsDir)openssl-1.1.1n\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.1u\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1u\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>

diff --git a/build.bat b/build.bat
@@ -5,7 +5,7 @@ cd C:\mnt
 set platf=Win32
 set builddir=c:\mnt\PCBuild
 set outdir=c:\mnt\build-out
-set py_version=3.8.16
+set py_version=3.8.17
 
 mkdir %outdir%
 if not exist %outdir% exit /b 3