From d6eb8921d3f2db2fe7b075f6be6a352745462467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Fri, 21 Mar 2025 09:03:47 +0100 Subject: [PATCH 1/3] adopt new pipeline templates format --- .vscode/settings.json | 6 +++- azure-pipelines/playground.yml | 53 +++++++++++++-------------------- azure-pipelines/pre-release.yml | 53 +++++++++++++-------------------- azure-pipelines/stable.yml | 53 +++++++++++++-------------------- 4 files changed, 68 insertions(+), 97 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b4dbabe..5af66b2a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,9 @@ }, "[toml]": { "editor.defaultFormatter": "tamasfe.even-better-toml" - } + }, + "git.branchProtection": [ + "main", + "release/*" + ] } diff --git a/azure-pipelines/playground.yml b/azure-pipelines/playground.yml index d49182dd..afb7e4f9 100644 --- a/azure-pipelines/playground.yml +++ b/azure-pipelines/playground.yml @@ -7,48 +7,37 @@ resources: - repository: templates type: github name: microsoft/vscode-engineering - ref: main + ref: joao/olive-donkey endpoint: Monaco extends: template: azure-pipelines/rust-package/pipeline.yml@templates parameters: - ghCreateTag: false binaryName: "pet" signing: false - buildWasm: false apiScanSoftwareVersion: 2024 # major version of `pet` for internal reporting buildPlatforms: - - name: Linux - vsceTarget: "web" - - name: Linux - packageArch: arm64 - vsceTarget: linux-arm64 - - name: Linux - packageArch: arm - vsceTarget: linux-armhf - - name: Linux - packageArch: x64 - vsceTarget: linux-x64 - - name: Linux - packageArch: arm64 - vsceTarget: alpine-arm64 - - name: Linux - packageArch: x64 - vsceTarget: alpine-x64 - - name: MacOS - packageArch: arm64 - vsceTarget: darwin-arm64 - - name: MacOS - packageArch: x64 - vsceTarget: darwin-x64 - - name: Windows - packageArch: arm - vsceTarget: win32-arm64 - - name: Windows - packageArch: x64 - vsceTarget: win32-x64 + - name: linux + target: x86_64-unknown-linux-musl + - name: linux + target: aarch64-unknown-linux-gnu + - name: linux + target: armv7-unknown-linux-gnueabihf + - name: linux + target: x86_64-unknown-linux-musl + - name: linux + target: aarch64-unknown-linux-gnu + - name: linux + target: x86_64-unknown-linux-musl + - name: darwin + target: aarch64-apple-darwin + - name: darwin + target: x86_64-apple-darwin + - name: windows + target: aarch64-pc-windows-msvc + - name: windows + target: x86_64-pc-windows-msvc preBuildSteps: - pwsh: Rename-Item -Path "./.cargo/config.toml.disabled" -NewName "config.toml" diff --git a/azure-pipelines/pre-release.yml b/azure-pipelines/pre-release.yml index 904ca5ef..c20b8055 100644 --- a/azure-pipelines/pre-release.yml +++ b/azure-pipelines/pre-release.yml @@ -10,16 +10,14 @@ resources: - repository: templates type: github name: microsoft/vscode-engineering - ref: main + ref: joao/olive-donkey endpoint: Monaco extends: template: azure-pipelines/rust-package/pipeline.yml@templates parameters: - ghCreateTag: false binaryName: "pet" signing: true - buildWasm: false apiScanSoftwareVersion: 2024 # major version of `pet` for internal reporting tsa: enabled: true @@ -28,35 +26,26 @@ extends: serviceTreeID: 6e6194bc-7baa-4486-86d0-9f5419626d46 buildPlatforms: - - name: Linux - vsceTarget: "web" - - name: Linux - packageArch: arm64 - vsceTarget: linux-arm64 - - name: Linux - packageArch: arm - vsceTarget: linux-armhf - - name: Linux - packageArch: x64 - vsceTarget: linux-x64 - - name: Linux - packageArch: arm64 - vsceTarget: alpine-arm64 - - name: Linux - packageArch: x64 - vsceTarget: alpine-x64 - - name: MacOS - packageArch: arm64 - vsceTarget: darwin-arm64 - - name: MacOS - packageArch: x64 - vsceTarget: darwin-x64 - - name: Windows - packageArch: arm - vsceTarget: win32-arm64 - - name: Windows - packageArch: x64 - vsceTarget: win32-x64 + - name: linux + target: x86_64-unknown-linux-musl + - name: linux + target: aarch64-unknown-linux-gnu + - name: linux + target: armv7-unknown-linux-gnueabihf + - name: linux + target: x86_64-unknown-linux-musl + - name: linux + target: aarch64-unknown-linux-gnu + - name: linux + target: x86_64-unknown-linux-musl + - name: darwin + target: aarch64-apple-darwin + - name: darwin + target: x86_64-apple-darwin + - name: windows + target: aarch64-pc-windows-msvc + - name: windows + target: x86_64-pc-windows-msvc preBuildSteps: - pwsh: Rename-Item -Path "./.cargo/config.toml.disabled" -NewName "config.toml" diff --git a/azure-pipelines/stable.yml b/azure-pipelines/stable.yml index 4b8ab328..286e0f3a 100644 --- a/azure-pipelines/stable.yml +++ b/azure-pipelines/stable.yml @@ -7,16 +7,14 @@ resources: - repository: templates type: github name: microsoft/vscode-engineering - ref: main + ref: joao/olive-donkey endpoint: Monaco extends: template: azure-pipelines/rust-package/pipeline.yml@templates parameters: - ghCreateTag: false binaryName: "pet" signing: true - buildWasm: false apiScanPublishSymbols: true apiScanSoftwareVersion: 2024 # major version of `pet` for internal reporting tsa: @@ -26,35 +24,26 @@ extends: serviceTreeID: 6e6194bc-7baa-4486-86d0-9f5419626d46 buildPlatforms: - - name: Linux - vsceTarget: "web" - - name: Linux - packageArch: arm64 - vsceTarget: linux-arm64 - - name: Linux - packageArch: arm - vsceTarget: linux-armhf - - name: Linux - packageArch: x64 - vsceTarget: linux-x64 - - name: Linux - packageArch: arm64 - vsceTarget: alpine-arm64 - - name: Linux - packageArch: x64 - vsceTarget: alpine-x64 - - name: MacOS - packageArch: arm64 - vsceTarget: darwin-arm64 - - name: MacOS - packageArch: x64 - vsceTarget: darwin-x64 - - name: Windows - packageArch: arm - vsceTarget: win32-arm64 - - name: Windows - packageArch: x64 - vsceTarget: win32-x64 + - name: linux + target: x86_64-unknown-linux-musl + - name: linux + target: aarch64-unknown-linux-gnu + - name: linux + target: armv7-unknown-linux-gnueabihf + - name: linux + target: x86_64-unknown-linux-musl + - name: linux + target: aarch64-unknown-linux-gnu + - name: linux + target: x86_64-unknown-linux-musl + - name: darwin + target: aarch64-apple-darwin + - name: darwin + target: x86_64-apple-darwin + - name: windows + target: aarch64-pc-windows-msvc + - name: windows + target: x86_64-pc-windows-msvc preBuildSteps: - pwsh: Rename-Item -Path "./.cargo/config.toml.disabled" -NewName "config.toml" From 1ce1d31cbaf80725902f7d22304ebbc5db334bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Fri, 21 Mar 2025 09:10:56 +0100 Subject: [PATCH 2/3] remove duplicate targets --- azure-pipelines/playground.yml | 4 ---- azure-pipelines/pre-release.yml | 4 ---- azure-pipelines/stable.yml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/azure-pipelines/playground.yml b/azure-pipelines/playground.yml index afb7e4f9..46926525 100644 --- a/azure-pipelines/playground.yml +++ b/azure-pipelines/playground.yml @@ -24,12 +24,8 @@ extends: target: aarch64-unknown-linux-gnu - name: linux target: armv7-unknown-linux-gnueabihf - - name: linux - target: x86_64-unknown-linux-musl - name: linux target: aarch64-unknown-linux-gnu - - name: linux - target: x86_64-unknown-linux-musl - name: darwin target: aarch64-apple-darwin - name: darwin diff --git a/azure-pipelines/pre-release.yml b/azure-pipelines/pre-release.yml index c20b8055..684ca122 100644 --- a/azure-pipelines/pre-release.yml +++ b/azure-pipelines/pre-release.yml @@ -32,12 +32,8 @@ extends: target: aarch64-unknown-linux-gnu - name: linux target: armv7-unknown-linux-gnueabihf - - name: linux - target: x86_64-unknown-linux-musl - name: linux target: aarch64-unknown-linux-gnu - - name: linux - target: x86_64-unknown-linux-musl - name: darwin target: aarch64-apple-darwin - name: darwin diff --git a/azure-pipelines/stable.yml b/azure-pipelines/stable.yml index 286e0f3a..1519fac9 100644 --- a/azure-pipelines/stable.yml +++ b/azure-pipelines/stable.yml @@ -30,12 +30,8 @@ extends: target: aarch64-unknown-linux-gnu - name: linux target: armv7-unknown-linux-gnueabihf - - name: linux - target: x86_64-unknown-linux-musl - name: linux target: aarch64-unknown-linux-gnu - - name: linux - target: x86_64-unknown-linux-musl - name: darwin target: aarch64-apple-darwin - name: darwin From a07f7e6dfa96b484019c0687530a12bff2b1d2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Fri, 21 Mar 2025 09:12:00 +0100 Subject: [PATCH 3/3] remove more duplicate targets --- azure-pipelines/playground.yml | 2 -- azure-pipelines/pre-release.yml | 2 -- azure-pipelines/stable.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/azure-pipelines/playground.yml b/azure-pipelines/playground.yml index 46926525..9321e80d 100644 --- a/azure-pipelines/playground.yml +++ b/azure-pipelines/playground.yml @@ -24,8 +24,6 @@ extends: target: aarch64-unknown-linux-gnu - name: linux target: armv7-unknown-linux-gnueabihf - - name: linux - target: aarch64-unknown-linux-gnu - name: darwin target: aarch64-apple-darwin - name: darwin diff --git a/azure-pipelines/pre-release.yml b/azure-pipelines/pre-release.yml index 684ca122..bf0617ae 100644 --- a/azure-pipelines/pre-release.yml +++ b/azure-pipelines/pre-release.yml @@ -32,8 +32,6 @@ extends: target: aarch64-unknown-linux-gnu - name: linux target: armv7-unknown-linux-gnueabihf - - name: linux - target: aarch64-unknown-linux-gnu - name: darwin target: aarch64-apple-darwin - name: darwin diff --git a/azure-pipelines/stable.yml b/azure-pipelines/stable.yml index 1519fac9..2db1a1fe 100644 --- a/azure-pipelines/stable.yml +++ b/azure-pipelines/stable.yml @@ -30,8 +30,6 @@ extends: target: aarch64-unknown-linux-gnu - name: linux target: armv7-unknown-linux-gnueabihf - - name: linux - target: aarch64-unknown-linux-gnu - name: darwin target: aarch64-apple-darwin - name: darwin