From 8f1681402810cefe3e5a03651c864acd6e426b2a Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 2 Sep 2024 22:17:54 -0700 Subject: [PATCH 1/7] Download `pet` from azure pipeline build --- build/azure-pipeline.pre-release.yml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 56bed785588f..29dfbc771755 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -98,15 +98,25 @@ extends: - script: npx gulp prePublishBundle displayName: Build - - script: nox --session azure_pet_checkout - displayName: Checkout python-environment-tools - env: - PYTHON_ENV_TOOLS_DEST: $(Build.SourcesDirectory) - PYTHON_ENV_TOOLS_REF: main - PYTHON_ENV_TOOLS_TEMP: $(Agent.TempDirectory) - - - script: nox --session azure_pet_build_before - displayName: Enable cargo config for azure + - bash: | + mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin + chmod +x $(Build.SourcesDirectory)/python-env-tools/bin + displayName: Make Directory for python-env-tool binary + + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'specific' + project: 'Monaco' + definition: 591 + buildVersionToDownload: 'latestFromBranch' + branchName: 'refs/heads/azure1' # TODO: change to main before merging to main + targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' + artifactName: 'bin-$(vsceTarget)' + itemPattern: '(pet.exe|pet)' + + - bash: | + chmod +x $(Build.SourcesDirectory)/python-env-tools/bin/pet* + displayName: Make pet executable - template: azure-pipelines/extension/templates/steps/build-extension-rust-package.yml@templates parameters: From aa1a1aec894a8d423a48099b59780ec283c40a26 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Sep 2024 11:34:57 -0700 Subject: [PATCH 2/7] Ensure notice is included --- build/azure-pipeline.pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 29dfbc771755..202aaa154468 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -112,7 +112,7 @@ extends: branchName: 'refs/heads/azure1' # TODO: change to main before merging to main targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' artifactName: 'bin-$(vsceTarget)' - itemPattern: '(pet.exe|pet)' + itemPattern: '(pet.exe|pet|ThirdPartyNotices.txt)' - bash: | chmod +x $(Build.SourcesDirectory)/python-env-tools/bin/pet* From f407f6ceb94821c7ebcaa5bd0f5d318f94f4e6bd Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Sep 2024 15:32:31 -0700 Subject: [PATCH 3/7] Use specific pipeline to pull the build of `pet` from --- build/azure-pipeline.pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 202aaa154468..4d960b7fea7e 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -109,7 +109,7 @@ extends: project: 'Monaco' definition: 591 buildVersionToDownload: 'latestFromBranch' - branchName: 'refs/heads/azure1' # TODO: change to main before merging to main + branchName: 'refs/heads/main' targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' artifactName: 'bin-$(vsceTarget)' itemPattern: '(pet.exe|pet|ThirdPartyNotices.txt)' From 05cb4e5d25ddb262b26d42cd3dc40c53992dda25 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Sep 2024 16:48:46 -0700 Subject: [PATCH 4/7] Remove tools dependency --- build/azure-pipeline.pre-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 4d960b7fea7e..a966e7ad01e7 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -31,7 +31,6 @@ extends: ghCreateTag: false standardizedVersioning: true l10nSourcePaths: ./src/client - needsTools: true buildPlatforms: - name: Linux From dcb3a92c851fad15ba726b8bfb7a66a49d03ac70 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Sep 2024 17:22:51 -0700 Subject: [PATCH 5/7] Fix pattern --- build/azure-pipeline.pre-release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index a966e7ad01e7..29fa647768d4 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -111,7 +111,10 @@ extends: branchName: 'refs/heads/main' targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin' artifactName: 'bin-$(vsceTarget)' - itemPattern: '(pet.exe|pet|ThirdPartyNotices.txt)' + itemPattern: | + pet.exe + pet + ThirdPartyNotices.txt - bash: | chmod +x $(Build.SourcesDirectory)/python-env-tools/bin/pet* From 44d6a941f8d5e30bcf921e4fd871b79c67c973dc Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Sep 2024 18:07:11 -0700 Subject: [PATCH 6/7] Tweak logs --- build/azure-pipeline.pre-release.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 29fa647768d4..34504d2d47c5 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -117,17 +117,10 @@ extends: ThirdPartyNotices.txt - bash: | + ls -lf $(Build.SourcesDirectory)/python-env-tools/bin chmod +x $(Build.SourcesDirectory)/python-env-tools/bin/pet* - displayName: Make pet executable - - - template: azure-pipelines/extension/templates/steps/build-extension-rust-package.yml@templates - parameters: - vsceTarget: $(vsceTarget) - binaryName: pet - signing: true - workingDirectory: $(Build.SourcesDirectory)/python-env-tools - buildWasm: false - runTest: false + ls -lf $(Build.SourcesDirectory)/python-env-tools/bin + displayName: Set chmod for pet binary - script: nox --session azure_pet_build_after displayName: Move bin to final location From de4088fc38a72ed0d863129d5f5e75577ced32bb Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 3 Sep 2024 18:52:45 -0700 Subject: [PATCH 7/7] Fix steps --- build/azure-pipeline.pre-release.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 34504d2d47c5..c6de846ee851 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -117,14 +117,11 @@ extends: ThirdPartyNotices.txt - bash: | - ls -lf $(Build.SourcesDirectory)/python-env-tools/bin - chmod +x $(Build.SourcesDirectory)/python-env-tools/bin/pet* - ls -lf $(Build.SourcesDirectory)/python-env-tools/bin + ls -lf ./python-env-tools/bin + chmod +x ./python-env-tools/bin/pet* + ls -lf ./python-env-tools/bin displayName: Set chmod for pet binary - - script: nox --session azure_pet_build_after - displayName: Move bin to final location - - script: python -c "import shutil; shutil.rmtree('.nox', ignore_errors=True)" displayName: Clean up Nox