From 06b4e97fd176af2dfb9b4b168d89b3eed71cb623 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:05:05 -0400 Subject: [PATCH 01/12] Update macOS VM in Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6093e86..8ad4cce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,7 +33,7 @@ variables: value: 'OTHER_CODE_SIGN_FLAGS="--timestamp" CURRENT_PROJECT_VERSION="$(Build.BuildNumber)"' pool: - vmImage: 'macOS-14' + vmImage: 'macOS-15' stages: - stage: build From f084fb9c69636b7ef107752bb4e9a0ecf0a980a7 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:51:05 -0400 Subject: [PATCH 02/12] Update pipelines to work around macos-15 vm openssl glitch --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ad4cce..1e30f47 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,6 +44,9 @@ stages: inputs: certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' certPwd: '$(P12_PASSWORD)' + opensslPkcsArgs: '-legacy' + # -legacy is a temporary patch for Azure pipeline while Microsoft updates macos-15 VMs' OpenSSL support + # see: https://github.com/microsoft/azure-pipelines-tasks/issues/20628 - task: InstallAppleProvisioningProfile@1 inputs: provProfileSecureFile: 'Morphic_Launcher_for_macOS.provisionprofile' From 6becad884ee40114b8cb405b1e4a86141174e1d3 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:12:26 -0400 Subject: [PATCH 03/12] Update pipelines to work around macos-15 vm openssl glitch --- azure-pipelines.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1e30f47..7b24c8d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,6 +40,15 @@ stages: jobs: - job: build steps: + - name : Install OpenSSL 1.1 manually + run : | + wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz + tar -xvf openssl-1.1.1w.tar.gz + cd openssl-1.1.1w + ./config --prefix=/usr/local/openssl + make + sudo make install + export PATH=/usr/local/openssl/bin:$PATH - task: InstallAppleCertificate@2 inputs: certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' From c3ad6ca63a1b75365cad35c683f6d88c4fd9f259 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:13:19 -0400 Subject: [PATCH 04/12] Update pipelines to work around macos-15 vm openssl glitch --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b24c8d..b3e9998 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,7 +40,7 @@ stages: jobs: - job: build steps: - - name : Install OpenSSL 1.1 manually + - name: Install OpenSSL 1.1 manually run : | wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz tar -xvf openssl-1.1.1w.tar.gz From 71f63ba9df15b1fc329f1153b2287cb4725ead5c Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:18:07 -0400 Subject: [PATCH 05/12] Update pipelines to work around macos-15 vm openssl glitch --- azure-pipelines.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3e9998..e8f347f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,15 +40,18 @@ stages: jobs: - job: build steps: - - name: Install OpenSSL 1.1 manually - run : | - wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz - tar -xvf openssl-1.1.1w.tar.gz - cd openssl-1.1.1w - ./config --prefix=/usr/local/openssl - make - sudo make install - export PATH=/usr/local/openssl/bin:$PATH + - task: Bash@3 + displayName: Install OpenSSL 1.1 manually + inputs: + targetType: 'inline' + script: | + wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz + tar -xvf openssl-1.1.1w.tar.gz + cd openssl-1.1.1w + ./config --prefix=/usr/local/openssl + make + sudo make install + export PATH=/usr/local/openssl/bin:$PATH - task: InstallAppleCertificate@2 inputs: certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' From d2a7c16086d19bcaaae7bbe1e01aa5ac0371df1b Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:18:59 -0400 Subject: [PATCH 06/12] Update pipelines to work around macos-15 vm openssl glitch --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e8f347f..dcad343 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,7 +56,7 @@ stages: inputs: certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' certPwd: '$(P12_PASSWORD)' - opensslPkcsArgs: '-legacy' + # opensslPkcsArgs: '-legacy' # -legacy is a temporary patch for Azure pipeline while Microsoft updates macos-15 VMs' OpenSSL support # see: https://github.com/microsoft/azure-pipelines-tasks/issues/20628 - task: InstallAppleProvisioningProfile@1 From 6ada8f60b04b496c0beae280ed43e6a38683d7d8 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:23:55 -0400 Subject: [PATCH 07/12] Update pipelines to work around macos-15 vm openssl glitch --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dcad343..789ca39 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,7 +38,7 @@ pool: stages: - stage: build jobs: - - job: build + - job: opensslfixup steps: - task: Bash@3 displayName: Install OpenSSL 1.1 manually @@ -52,6 +52,10 @@ stages: make sudo make install export PATH=/usr/local/openssl/bin:$PATH + + - job: build + dependsOn: opensslfixup + steps: - task: InstallAppleCertificate@2 inputs: certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' From 370a672500b89bfa77c8540e40e8c877711f9439 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:36:39 -0400 Subject: [PATCH 08/12] Update pipelines to work around macos-15 vm openssl glitch --- azure-pipelines.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 789ca39..82af31f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,23 +38,7 @@ pool: stages: - stage: build jobs: - - job: opensslfixup - steps: - - task: Bash@3 - displayName: Install OpenSSL 1.1 manually - inputs: - targetType: 'inline' - script: | - wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz - tar -xvf openssl-1.1.1w.tar.gz - cd openssl-1.1.1w - ./config --prefix=/usr/local/openssl - make - sudo make install - export PATH=/usr/local/openssl/bin:$PATH - - job: build - dependsOn: opensslfixup steps: - task: InstallAppleCertificate@2 inputs: From e34114917a764b40c83a71bf573b3f4d6c946763 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:51:43 -0400 Subject: [PATCH 09/12] Update azure-pipelines.yml --- azure-pipelines.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 82af31f..053f247 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,11 +42,8 @@ stages: steps: - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' - certPwd: '$(P12_PASSWORD)' - # opensslPkcsArgs: '-legacy' - # -legacy is a temporary patch for Azure pipeline while Microsoft updates macos-15 VMs' OpenSSL support - # see: https://github.com/microsoft/azure-pipelines-tasks/issues/20628 + certSecureFile: 'raising_the_floor_5AAXYGZ428_OpenSSL3.p12' + certPwd: '$(P12_PASSWORD)' - task: InstallAppleProvisioningProfile@1 inputs: provProfileSecureFile: 'Morphic_Launcher_for_macOS.provisionprofile' From 2b7445028beb138ac29e843b7195d39664b5f871 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:57:36 -0400 Subject: [PATCH 10/12] Revert to OpenSSL 1.1 cert for now --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 053f247..eb673c4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,8 +42,9 @@ stages: steps: - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'raising_the_floor_5AAXYGZ428_OpenSSL3.p12' + certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' certPwd: '$(P12_PASSWORD)' +# certSecureFile: 'raising_the_floor_5AAXYGZ428_OpenSSL3.p12' - task: InstallAppleProvisioningProfile@1 inputs: provProfileSecureFile: 'Morphic_Launcher_for_macOS.provisionprofile' From 9009cf7665079d89e44da6524ed8496267ca94e4 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:35:58 -0400 Subject: [PATCH 11/12] Update azure-pipelines.yml --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb673c4..5e921c7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,9 +42,9 @@ stages: steps: - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' + certSecureFile: 'raising_the_floor_5AAXYGZ428_OpenSSL3.p12' certPwd: '$(P12_PASSWORD)' -# certSecureFile: 'raising_the_floor_5AAXYGZ428_OpenSSL3.p12' +# certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' - task: InstallAppleProvisioningProfile@1 inputs: provProfileSecureFile: 'Morphic_Launcher_for_macOS.provisionprofile' From e62ced939512abe115e909833b91fbf8cba23d08 Mon Sep 17 00:00:00 2001 From: Christopher - RtF <58520035+christopher-rtf@users.noreply.github.com> Date: Tue, 19 Nov 2024 02:56:16 -0400 Subject: [PATCH 12/12] Revert to macOS 14 --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e921c7..b6ce300 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,7 +33,7 @@ variables: value: 'OTHER_CODE_SIGN_FLAGS="--timestamp" CURRENT_PROJECT_VERSION="$(Build.BuildNumber)"' pool: - vmImage: 'macOS-15' + vmImage: 'macOS-14' stages: - stage: build @@ -42,9 +42,9 @@ stages: steps: - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'raising_the_floor_5AAXYGZ428_OpenSSL3.p12' + certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' certPwd: '$(P12_PASSWORD)' -# certSecureFile: 'raising_the_floor_5AAXYGZ428.p12' +# certSecureFile: 'raising_the_floor_5AAXYGZ428_OpenSSL3.p12' - task: InstallAppleProvisioningProfile@1 inputs: provProfileSecureFile: 'Morphic_Launcher_for_macOS.provisionprofile'