diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index d45a296b737..143313aa57e 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -5,7 +5,7 @@ on: pull_request: # Note that we only support automerge on branches that have required checks. branches: - - master + - main - feature/* types: - labeled @@ -19,7 +19,7 @@ on: pull_request_review: # Note that we only support automerge on branches that have required checks. branches: - - master + - main - feature/* types: - submitted diff --git a/.github/workflows/qdk-sync.yml b/.github/workflows/qdk-sync.yml new file mode 100644 index 00000000000..26b4da3d7d6 --- /dev/null +++ b/.github/workflows/qdk-sync.yml @@ -0,0 +1,28 @@ +name: Sync QDK repos + +on: + push: + branches: + - main + +jobs: + sync-repos: + runs-on: ubuntu-latest + steps: + - name: Login to Azure + uses: Azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - id: AzureKeyVault + uses: Azure/get-keyvault-secrets@v1.0 + with: + keyvault: 'kv-qdk-build' + secrets: 'qdkBuildPAT' + + - name: 'Trigger QDK sync build' + uses: Azure/pipelines@releases/v1 + with: + azure-devops-project-url: 'https://dev.azure.com/ms-quantum-public/Microsoft Quantum (public)' + azure-pipeline-name: 'microsoft.qdk.sync' + azure-devops-token: ${{ steps.AzureKeyVault.outputs.qdkBuildPAT }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 720a2c62f04..7a4ad5261f8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: trailing-whitespace args: [--markdown-linebreak-ext=md] - id: no-commit-to-branch - args: [-b, "master"] + args: [-b, "main"] - id: check-yaml - repo: local hooks: diff --git a/Build/e2e.yml b/Build/e2e.yml new file mode 100644 index 00000000000..a5b980711be --- /dev/null +++ b/Build/e2e.yml @@ -0,0 +1,33 @@ +name: $(Build.Major).$(Build.Minor).$(date:yyMM).$(BuildId) + +parameters: +- name: validation_level + displayName: Validation Level + type: string + default: normal + values: + - minimal + - normal + - full + +trigger: none + +pr: +- main +- feature/* +- features/* +- release/* + +resources: + repositories: + - repository: qdk + type: github + endpoint: github + name: microsoft/qdk + ref: refs/heads/main + +extends: + template: build/qdk-module-e2e.yml@qdk + parameters: + module: QuantumLibraries + validation_level: ${{ parameters.validation_level }} diff --git a/Chemistry/README.md b/Chemistry/README.md index af55bebbab0..53784f5a395 100644 --- a/Chemistry/README.md +++ b/Chemistry/README.md @@ -1,14 +1,14 @@ # Microsoft Quantum Chemistry Library # This folder contains the C# and Q# sources used to implement the [Microsoft Quantum Chemistry library](https://docs.microsoft.com/en-us/quantum/libraries/chemistry/). -Samples of how to use the library can be found in the Chemistry folder of the [Microsoft/Quantum repository](https://github.com/Microsoft/Quantum/tree/master/Chemistry). +Samples of how to use the library can be found in the Chemistry folder of the [Microsoft/Quantum repository](https://github.com/microsoft/Quantum/tree/main/Chemistry). ## Building and testing ## The quantum chemistry library consists of two cross-platform project built using [.NET Core](https://docs.microsoft.com/en-us/dotnet/core/): -- [**DataModel.csproj**](https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry/src/DataModel/DataModel.csproj): C# sources used to load, parse, and pre-compute Hamiltonians loaded from LIQ𝑈𝑖|〉 or Broombridge files. -- [**Runtime.csproj**](https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry/src/Runtime/Runtime.csproj): Q# sources used to implement quantum chemistry simulation algorithms, given representations produced by the DataModel. +- [**DataModel.csproj**](https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry/src/DataModel/DataModel.csproj): C# sources used to load, parse, and pre-compute Hamiltonians loaded from LIQ𝑈𝑖|〉 or Broombridge files. +- [**Runtime.csproj**](https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry/src/Runtime/Runtime.csproj): Q# sources used to implement quantum chemistry simulation algorithms, given representations produced by the DataModel. Once .NET Core is installed, you may build and run its tests by executing the following from a command line: diff --git a/Chemistry/src/DataModel/DataModel.csproj b/Chemistry/src/DataModel/DataModel.csproj index 47f07491b0d..bdc7bb56ed9 100644 --- a/Chemistry/src/DataModel/DataModel.csproj +++ b/Chemistry/src/DataModel/DataModel.csproj @@ -14,7 +14,7 @@ Microsoft.Quantum.Chemistry.DataModel See: https://docs.microsoft.com/en-us/quantum/relnotes/ MIT - https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry + https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry qdk-nuget-icon.png Quantum Q# Qsharp 1591 diff --git a/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.1.cs b/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.1.cs index e38acf87039..60864998679 100644 --- a/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.1.cs +++ b/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.1.cs @@ -128,7 +128,7 @@ internal static V0_1.IntegralSet ToBroombridgeV0_1(this ElectronicStructureProbl #region Broombridge v0.1 format public static class V0_1 { - public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/master/Chemistry/Schema/broombridge-0.1.schema.json"; + public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/main/Chemistry/Schema/broombridge-0.1.schema.json"; public struct Data { diff --git a/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.2.cs b/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.2.cs index 2bcc87a8162..755a6c80a63 100644 --- a/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.2.cs +++ b/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeDataStructurev0.2.cs @@ -167,7 +167,7 @@ this IEnumerable initialStates #region Broombridge v0.2 format public static class V0_2 { - public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json"; + public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json"; internal static class UpdaterStrings { public const string SingleConfigurational = "single_configurational"; diff --git a/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeSerializer.cs b/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeSerializer.cs index 3616e82ca97..ce02a23a0b2 100644 --- a/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeSerializer.cs +++ b/Chemistry/src/DataModel/Serialization/Broombridge/BroombridgeSerializer.cs @@ -92,7 +92,7 @@ public static class Deserializers /// internal static Dictionary VersionNumberDict = new Dictionary() { - // https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.1.schema.json + // https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.1.schema.json ["0.1"] = VersionNumber.v0_1, ["broombridge-0.1.schema"] = VersionNumber.v0_1, // TODO: URL of 0.2 schema. diff --git a/Chemistry/src/Jupyter/Jupyter.csproj b/Chemistry/src/Jupyter/Jupyter.csproj index 833b8769531..c949abacfd0 100644 --- a/Chemistry/src/Jupyter/Jupyter.csproj +++ b/Chemistry/src/Jupyter/Jupyter.csproj @@ -10,8 +10,8 @@ Microsoft's Quantum Chemistry Libraries Jupyter integration. © Microsoft Corporation. All rights reserved. See: https://docs.microsoft.com/en-us/quantum/relnotes/ - https://github.com/Microsoft/QuantumLibraries/raw/master/LICENSE.txt - https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry + https://github.com/microsoft/QuantumLibraries/raw/main/LICENSE.txt + https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry qdk-nuget-icon.png Quantum Q# Qsharp Jupyter 1591 diff --git a/Chemistry/src/Metapackage/Metapackage.csproj b/Chemistry/src/Metapackage/Metapackage.csproj index d4b1668e95a..cd940394e81 100644 --- a/Chemistry/src/Metapackage/Metapackage.csproj +++ b/Chemistry/src/Metapackage/Metapackage.csproj @@ -13,7 +13,7 @@ Microsoft.Quantum.Chemistry See: https://docs.microsoft.com/en-us/quantum/relnotes/ MIT - https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry + https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry qdk-nuget-icon.png Quantum Q# Qsharp 1591 diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj index aa91f2bf0ef..902c0c66483 100644 --- a/Chemistry/src/Runtime/Runtime.csproj +++ b/Chemistry/src/Runtime/Runtime.csproj @@ -15,7 +15,7 @@ Microsoft.Quantum.Chemistry.Runtime See: https://docs.microsoft.com/en-us/quantum/relnotes/ MIT - https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry + https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry qdk-nuget-icon.png Quantum Q# Qsharp 1591 diff --git a/Chemistry/tests/TestData/Broombridge/LiH_0.1.yaml b/Chemistry/tests/TestData/Broombridge/LiH_0.1.yaml index d445ffea4e1..4da9dd7aede 100644 --- a/Chemistry/tests/TestData/Broombridge/LiH_0.1.yaml +++ b/Chemistry/tests/TestData/Broombridge/LiH_0.1.yaml @@ -1,5 +1,5 @@ -"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.1.schema.json +"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.1.schema.json bibliography: - {url: 'https://www.nwchem-sw.org'} diff --git a/Chemistry/tests/TestData/Broombridge/LiH_0.2.yaml b/Chemistry/tests/TestData/Broombridge/LiH_0.2.yaml index 48fd61a5792..3c0586b6c06 100644 --- a/Chemistry/tests/TestData/Broombridge/LiH_0.2.yaml +++ b/Chemistry/tests/TestData/Broombridge/LiH_0.2.yaml @@ -1,4 +1,4 @@ -"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json +"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json bibliography: - {url: 'https://www.nwchem-sw.org'} diff --git a/Chemistry/tests/TestData/Broombridge/broombridge_v0.1.yaml b/Chemistry/tests/TestData/Broombridge/broombridge_v0.1.yaml index b74f4f0072f..2617b40d25a 100644 --- a/Chemistry/tests/TestData/Broombridge/broombridge_v0.1.yaml +++ b/Chemistry/tests/TestData/Broombridge/broombridge_v0.1.yaml @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # Generated by nwchem version v... -"$schema": https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.1.schema.json +"$schema": https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.1.schema.json format: # required version: "0.1" # must match exactly generator: # optional diff --git a/Chemistry/tests/TestData/Broombridge/broombridge_v0.2.yaml b/Chemistry/tests/TestData/Broombridge/broombridge_v0.2.yaml index b6bb948516f..79d3d30d62e 100644 --- a/Chemistry/tests/TestData/Broombridge/broombridge_v0.2.yaml +++ b/Chemistry/tests/TestData/Broombridge/broombridge_v0.2.yaml @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # Generated by nwchem version v... -"$schema": https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.2.schema.json +"$schema": https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.2.schema.json format: version: "0.2" # required. Must match exactly generator: # optional diff --git a/Chemistry/tests/TestData/Broombridge/hydrogen_0.1.yaml b/Chemistry/tests/TestData/Broombridge/hydrogen_0.1.yaml index fda4dff03ef..fdf98af2368 100644 --- a/Chemistry/tests/TestData/Broombridge/hydrogen_0.1.yaml +++ b/Chemistry/tests/TestData/Broombridge/hydrogen_0.1.yaml @@ -1,5 +1,5 @@ -"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.1.schema.json +"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.1.schema.json bibliography: - {url: 'https://www.nwchem-sw.org'} diff --git a/Chemistry/tests/TestData/Broombridge/hydrogen_0.2.yaml b/Chemistry/tests/TestData/Broombridge/hydrogen_0.2.yaml index 61bd380ccd3..129c9bf1390 100644 --- a/Chemistry/tests/TestData/Broombridge/hydrogen_0.2.yaml +++ b/Chemistry/tests/TestData/Broombridge/hydrogen_0.2.yaml @@ -1,5 +1,5 @@ -"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json +"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json bibliography: - {url: 'https://www.nwchem-sw.org'} diff --git a/Chemistry/tests/TestData/FciDump/h2_631g.yaml b/Chemistry/tests/TestData/FciDump/h2_631g.yaml index 9024b04fdd4..292b786e7de 100644 --- a/Chemistry/tests/TestData/FciDump/h2_631g.yaml +++ b/Chemistry/tests/TestData/FciDump/h2_631g.yaml @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # H2 molecule using 6-31G basis, containing 2 electrons 4 orbitals -$schema: https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json +$schema: https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json format: version: '0.2' problem_description: diff --git a/MachineLearning/src/MachineLearning.csproj b/MachineLearning/src/MachineLearning.csproj index d1028037fc1..73b86c36b20 100644 --- a/MachineLearning/src/MachineLearning.csproj +++ b/MachineLearning/src/MachineLearning.csproj @@ -30,7 +30,7 @@ Microsoft.Quantum.MachineLearning See: https://docs.microsoft.com/quantum/relnotes/ MIT - https://github.com/Microsoft/QuantumLibraries/tree/master/MachineLearning + https://github.com/microsoft/QuantumLibraries/tree/main/MachineLearning qdk-nuget-icon.png Quantum Q# Qsharp 1591 diff --git a/Python/qsharp-chemistry/qsharp/tests/broombridge.yaml b/Python/qsharp-chemistry/qsharp/tests/broombridge.yaml index 070201bc5e0..1c47e5fe34e 100644 --- a/Python/qsharp-chemistry/qsharp/tests/broombridge.yaml +++ b/Python/qsharp-chemistry/qsharp/tests/broombridge.yaml @@ -1,7 +1,7 @@ # © Microsoft # MIT license # Generated by nwchem version v... -"$schema": https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.2.schema.json +"$schema": https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.2.schema.json format: version: "0.2" # required. Must match exactly generator: # optional diff --git a/README.md b/README.md index fe930f1f41c..2cccf9b1bf0 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ of samples on how to use these libraries to write quantum based programs. | branch | status | |--------|-----------| -| master | [![Build Status](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_apis/build/status/Microsoft.QuantumLibraries?branchName=master)](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_build/latest?definitionId=1&branchName=master) | +| main | [![Build Status](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_apis/build/status/Microsoft.QuantumLibraries?branchName=main)](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_build/latest?definitionId=1&branchName=main) | ## Feedback ## diff --git a/Standard/src/Synthesis/ControlledOnTruthTable.qs b/Standard/src/Synthesis/ControlledOnTruthTable.qs index c716242ea53..6f28a15894d 100644 --- a/Standard/src/Synthesis/ControlledOnTruthTable.qs +++ b/Standard/src/Synthesis/ControlledOnTruthTable.qs @@ -139,7 +139,7 @@ namespace Microsoft.Quantum.Synthesis { /// and the least significant bit `0` corresponds to the input assignment `(0, 0, 0)`. /// It can be represented by the big integer `0xE8L` in hexadecimal notation or as `232L` /// in decimal notation. The `L` suffix indicates that the constant is of type `BigInt`. - /// More details on this representation can also be found in the [truth tables kata](https://github.com/microsoft/QuantumKatas/tree/master/TruthTables). + /// More details on this representation can also be found in the [truth tables kata](https://github.com/microsoft/QuantumKatas/tree/main/TruthTables). /// /// The implementation makes use of @"microsoft.quantum.intrinsic.cnot" /// and @"microsoft.quantum.intrinsic.r1" gates. diff --git a/build.yml b/build.yml index 10d43034934..2d78da0bab9 100644 --- a/build.yml +++ b/build.yml @@ -2,9 +2,14 @@ # Build configuration file to run build on azure-pipelines # name: $(Build.Major).$(Build.Minor).$(date:yyMM).$(DayOfMonth)$(rev:rr) -trigger: -- master + +trigger: none + +pr: +- main - feature/* +- features/* +- release/* variables: Build.Major: 0 diff --git a/sync.cmd b/sync.cmd index b0b089f4319..396148cc7b2 100644 --- a/sync.cmd +++ b/sync.cmd @@ -3,7 +3,7 @@ :: the public repository (https://github.com/Microsoft/Quantum.git) :: set branch=%1 -IF "%branch%" == "" SET branch=master +IF "%branch%" == "" SET branch=main git fetch origin git fetch public || call :addPublic