From 0c7065e2ed97d94ac9fd3ade8cbaa9645fb4de35 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sun, 24 Nov 2024 12:19:01 +0000 Subject: [PATCH 1/2] Update windows codesigning for scheduled build Copies changes from https://github.com/JuliaCI/julia-buildkite/commit/8a43cc96e67b9c810f6926ca1a1a82ceb81be33a#diff-e3eba28011c21d4b466a1b87b33e4706b7a525b89707c28cbb4757f1d5697694R51 to upload_windows.yml to the scheduled build. --- pipelines/scheduled/platforms/upload_windows.no_gpl.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pipelines/scheduled/platforms/upload_windows.no_gpl.yml b/pipelines/scheduled/platforms/upload_windows.no_gpl.yml index 1ad87f61..fe4cfa8a 100644 --- a/pipelines/scheduled/platforms/upload_windows.no_gpl.yml +++ b/pipelines/scheduled/platforms/upload_windows.no_gpl.yml @@ -25,7 +25,9 @@ steps: variables: - AWS_ACCESS_KEY_ID="U2FsdGVkX184v87+NPs3j9r/JoIuOrYt4/Z4wnRdklnY17NP8C8AMZvWYLJfT9t1" - AWS_SECRET_ACCESS_KEY="U2FsdGVkX1+qptnxR/Mo5jZdH8OQfflRPiQBEhjgZIiTpn8KNCJYh/Cb8xxaUWazlcM9ceOlo0InDubL+J8zdg==" - - WINDOWS_CODESIGN_PASSWORD="U2FsdGVkX1+wiqniliFf7YWn1f/Y2rppITsOMvLGgK8n+GYWXWJH+POojLhEwU75" + - AZURE_TENANT_ID="U2FsdGVkX1+c2HbeSTq1c0fEep5riO3+PSQCiovdRT5akVpyy5hC311cXUCUB+A7ivIezAdJ7oz3dt19t60iuw==" + - AZURE_CLIENT_ID="U2FsdGVkX195QeT0ywNdXSa2ctMb9DFXyFVo0zG0/GtZUw95PTycqSZ+qEwXZbRZhGxXjGMVzcP2XZ0f/OuNnQ==" + - AZURE_CLIENT_SECRET="U2FsdGVkX1/905nz82Iy5toukRXEO8QS2etwfFCocofgnpBB62wJRDrWClPCNEX6ICo0jQzgoSbwDr2+C1ETSA==" files: - .buildkite/secrets/tarball_signing.gpg - .buildkite/secrets/windows_codesigning.pfx @@ -46,9 +48,11 @@ steps: # Have to include this for `buildkite-agent` to work: - "BUILDKITE_AGENT_ACCESS_TOKEN" # Have to include these for codesigning and uploading - - "WINDOWS_CODESIGN_PASSWORD" - "AWS_ACCESS_KEY_ID" - "AWS_SECRET_ACCESS_KEY" + - "AZURE_TENANT_ID" + - "AZURE_CLIENT_ID" + - "AZURE_CLIENT_SECRET" # These control where we upload, important when running on julia-buildkite - "S3_BUCKET" - "S3_BUCKET_PREFIX" From 0e06fc1a6a29253988317d3da0c0a87b46d13565 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sun, 24 Nov 2024 12:23:44 +0000 Subject: [PATCH 2/2] Bump docker version as well https://github.com/JuliaCI/julia-buildkite/commit/8a43cc96e67b9c810f6926ca1a1a82ceb81be33a#diff-e3eba28011c21d4b466a1b87b33e4706b7a525b89707c28cbb4757f1d5697694R51 did it so presumably should do it here as well. --- pipelines/scheduled/platforms/build_windows.no_gpl.arches | 2 +- pipelines/scheduled/platforms/upload_windows.no_gpl.arches | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipelines/scheduled/platforms/build_windows.no_gpl.arches b/pipelines/scheduled/platforms/build_windows.no_gpl.arches index 0d264ecd..d9ff3a4b 100644 --- a/pipelines/scheduled/platforms/build_windows.no_gpl.arches +++ b/pipelines/scheduled/platforms/build_windows.no_gpl.arches @@ -1,5 +1,5 @@ # OS TRIPLET ARCH DOCKER_ARCH MAKE_FLAGS TIMEOUT DOCKER_TAG -windows x86_64-w64-mingw32nogpl x86_64 x86_64 VERBOSE=1 . v5.44 +windows x86_64-w64-mingw32nogpl x86_64 x86_64 VERBOSE=1 . v7.10 # These special lines allow us to embed default values for the columns above. # Any column without a default mapping here will simply substitute a `.` to the empty string diff --git a/pipelines/scheduled/platforms/upload_windows.no_gpl.arches b/pipelines/scheduled/platforms/upload_windows.no_gpl.arches index 269d9bc8..d753dbab 100644 --- a/pipelines/scheduled/platforms/upload_windows.no_gpl.arches +++ b/pipelines/scheduled/platforms/upload_windows.no_gpl.arches @@ -1,5 +1,5 @@ # OS TRIPLET DOCKER_TAG TIMEOUT -windows x86_64-w64-mingw32nogpl v5.44 . +windows x86_64-w64-mingw32nogpl v7.10 . # These special lines allow us to embed default values for the columns above. # Any column without a default mapping here will simply substitute a `.` to the empty string