diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a01a49e2239..9ae3c62db69 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,18 +1,15 @@ trigger: - main -- master - staging/* - next_stable - 20* pr: - main -- master - next_stable - 20* variables: - isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] runCondition: true targetBranch: $[ variables['System.PullRequest.TargetBranchName'] ] diff --git a/build_projects.yml b/build_projects.yml index 7bda2f12666..d35ced8bf83 100644 --- a/build_projects.yml +++ b/build_projects.yml @@ -1,19 +1,17 @@ trigger: - main -- master - next_stable - 20* pr: - main -- master - next_stable - 20* variables: - group: noos_releases_group_variables -- name: isMaster - value: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] +- name: isMain + value: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')] - name: isNextStable value: $[eq(variables['Build.SourceBranch'], 'refs/heads/next_stable')] - name: isRelease @@ -40,7 +38,7 @@ jobs: displayName: 'Run project build' - task: PublishPipelineArtifact@1 timeoutInMinutes: 10 - condition: or(eq(variables.isMaster, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) + condition: or(eq(variables.isMain, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) inputs: targetPath: '$(Build.Repository.LocalPath)/$(RELEASE_DIR)' artifact: '$(ARTIFACT_NAME)_Xilinx' @@ -72,7 +70,7 @@ jobs: displayName: 'Run project build' - task: PublishPipelineArtifact@1 timeoutInMinutes: 10 - condition: or(eq(variables.isMaster, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) + condition: or(eq(variables.isMain, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) inputs: targetPath: '$(Build.Repository.LocalPath)/$(RELEASE_DIR)' artifact: '$(ARTIFACT_NAME)_STM32' @@ -104,7 +102,7 @@ jobs: displayName: 'Run project build' - task: PublishPipelineArtifact@1 timeoutInMinutes: 10 - condition: or(eq(variables.isMaster, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) + condition: or(eq(variables.isMain, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) inputs: targetPath: '$(Build.Repository.LocalPath)/$(RELEASE_DIR)' artifact: '$(ARTIFACT_NAME)_Maxim' @@ -136,7 +134,7 @@ jobs: displayName: 'Run project build' - task: PublishPipelineArtifact@1 timeoutInMinutes: 10 - condition: or(eq(variables.isMaster, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) + condition: or(eq(variables.isMain, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) inputs: targetPath: '$(Build.Repository.LocalPath)/$(RELEASE_DIR)' artifact: '$(ARTIFACT_NAME)_Mbed' @@ -168,7 +166,7 @@ jobs: displayName: 'Run project build' - task: PublishPipelineArtifact@1 timeoutInMinutes: 10 - condition: or(eq(variables.isMaster, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) + condition: or(eq(variables.isMain, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) inputs: targetPath: '$(Build.Repository.LocalPath)/$(RELEASE_DIR)' artifact: '$(ARTIFACT_NAME)_Pico' @@ -200,7 +198,7 @@ jobs: displayName: 'Run project build' - task: PublishPipelineArtifact@1 timeoutInMinutes: 10 - condition: or(eq(variables.isMaster, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) + condition: or(eq(variables.isMain, true), eq(variables.isNextStable, true), eq(variables.isRelease, true)) inputs: targetPath: '$(Build.Repository.LocalPath)/$(RELEASE_DIR)' artifact: '$(ARTIFACT_NAME)_ADuCM3029'