diff --git a/ci/build-unix.yml b/ci/build-unix.yml index 2209a72583b..e402cc75838 100644 --- a/ci/build-unix.yml +++ b/ci/build-unix.yml @@ -47,10 +47,12 @@ steps: ARTIFACTORY_USERNAME: $(ARTIFACTORY_USERNAME) ARTIFACTORY_PASSWORD: $(ARTIFACTORY_PASSWORD) - - template: publish-platform-independence-dar.yml - parameters: - platform: '${{parameters.name}}' - is_release: '${{parameters.is_release}}' + # Do not publish dar from m1 + - ${{ if ne(parameters.name, 'm1') }}: + - template: publish-platform-independence-dar.yml + parameters: + platform: '${{parameters.name}}' + is_release: '${{parameters.is_release}}' - bash: | set -euo pipefail @@ -102,6 +104,9 @@ steps: env: DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}} name: publish + condition: and(succeeded(), + eq(${{parameters.is_release}}, 'true'), + eq(variables['Build.SourceBranchName'], 'main')) - task: PublishPipelineArtifact@0 inputs: targetPath: $(Build.StagingDirectory)/release diff --git a/ci/build.yml b/ci/build.yml index 0640d7bedbc..2da10defcf0 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -79,7 +79,7 @@ jobs: - name: is_release value: $[ dependencies.check_for_release.outputs['out.is_release'] ] - template: job-variables.yml - timeoutInMinutes: 360 + timeoutInMinutes: 180 pool: name: 'ubuntu_20_04' demands: assignment -equals default @@ -141,7 +141,7 @@ jobs: value: $[ and(eq(variables.is_release, 'true'), eq(variables['Build.SourceBranchName'], 'main')) ] - template: job-variables.yml - timeoutInMinutes: 360 + timeoutInMinutes: 180 pool: name: 'windows-pool' demands: assignment -equals default @@ -195,7 +195,7 @@ jobs: - job: Linux_oracle dependsOn: - build_canton - timeoutInMinutes: 360 + timeoutInMinutes: 180 pool: name: 'ubuntu_20_04' demands: assignment -equals default @@ -340,7 +340,7 @@ jobs: - check_for_release condition: and(succeeded(), not(eq(dependencies.check_for_release.outputs['out.is_release'], 'true'))) - timeoutInMinutes: 360 + timeoutInMinutes: 180 pool: name: ubuntu_20_04 demands: assignment -equals default @@ -357,7 +357,7 @@ jobs: - check_for_release - compatibility_ts_libs - build_canton - timeoutInMinutes: 360 + timeoutInMinutes: 180 pool: name: ubuntu_20_04 demands: assignment -equals default diff --git a/ci/macOS.yml b/ci/macOS.yml index 1e84b1d3741..976d863ee42 100644 --- a/ci/macOS.yml +++ b/ci/macOS.yml @@ -11,7 +11,7 @@ jobs: dependsOn: - check_for_release - build_canton - timeoutInMinutes: 360 + timeoutInMinutes: 180 pool: name: macOS-pool demands: assignment -equals ${{parameters.assignment}} @@ -28,7 +28,9 @@ jobs: value: $[ dependencies.check_for_release.outputs['out.is_release'] ] - template: job-variables.yml steps: - - template: report-start.yml + # Do not record start/end times for m1 + - ${{ if eq(parameters.name, 'macos') }}: + - template: report-start.yml - template: clear-shared-segments-macos.yml - checkout: self - bash: | @@ -38,13 +40,19 @@ jobs: condition: and(succeeded(), eq(variables.is_release, 'true')) - template: get-local-canton.yml - template: clean-up.yml - - template: build-unix.yml - parameters: - release_tag: $(release_tag) - name: ${{parameters.name}} - is_release: variables.is_release - - template: upload-bazel-metrics.yml + # Do not build m1 on releases + - ${{ if or(eq(parameters.name, 'macos'), eq(variables.is_release, 'false')) }}: + - template: build-unix.yml + parameters: + release_tag: $(release_tag) + name: ${{parameters.name}} + is_release: variables.is_release + # Do not upload metrics for m1 + - ${{ if eq(parameters.name, 'macos') }}: + - template: upload-bazel-metrics.yml - template: tell-slack-failed.yml parameters: trigger_sha: '$(trigger_sha)' - - template: report-end.yml + # Do not record start/end times for m1 + - ${{ if eq(parameters.name, 'macos') }}: + - template: report-end.yml