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..9321e80d 100644 --- a/azure-pipelines/playground.yml +++ b/azure-pipelines/playground.yml @@ -7,48 +7,31 @@ 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: 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..bf0617ae 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,20 @@ 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: 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..2db1a1fe 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,20 @@ 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: 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"