run m1 sometimes (#17099)

This commit is contained in:
Gary Verhaegen 2023-07-12 11:31:38 +02:00 committed by GitHub
parent f6379328e9
commit 3b9951bc7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 12 deletions

View File

@ -3,6 +3,7 @@
parameters: parameters:
var_name: "" var_name: ""
condition: 'True'
steps: steps:
- bash: | - bash: |
@ -147,4 +148,4 @@ steps:
END END
echo "##vso[task.setvariable variable=${{parameters.var_name}}]$TMP" echo "##vso[task.setvariable variable=${{parameters.var_name}}]$TMP"
displayName: install Bash lib displayName: install Bash lib
condition: always() condition: ${{parameters.condition}}

View File

@ -10,12 +10,18 @@ parameters:
steps: steps:
- bash: ci/dev-env-install.sh - bash: ci/dev-env-install.sh
displayName: 'Build/Install the Developer Environment' displayName: 'Build/Install the Developer Environment'
condition: and(succeeded(),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
- bash: | - bash: |
source dev-env/lib/ensure-nix source dev-env/lib/ensure-nix
ci/dev-env-push.py ci/dev-env-push.py
displayName: 'Push Developer Environment build results' displayName: 'Push Developer Environment build results'
condition: eq(variables['System.PullRequest.IsFork'], 'False') condition: and(succeeded(),
eq(variables['System.PullRequest.IsFork'], 'False'),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
env: env:
# to upload to the Nix cache # to upload to the Nix cache
GOOGLE_APPLICATION_CREDENTIALS_CONTENT: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT) GOOGLE_APPLICATION_CREDENTIALS_CONTENT: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT)
@ -27,6 +33,9 @@ steps:
IS_FORK: $(System.PullRequest.IsFork) IS_FORK: $(System.PullRequest.IsFork)
# to upload to the bazel cache # to upload to the bazel cache
GOOGLE_APPLICATION_CREDENTIALS_CONTENT: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT) GOOGLE_APPLICATION_CREDENTIALS_CONTENT: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT)
condition: and(succeeded(),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
- bash: ./fmt.sh --test - bash: ./fmt.sh --test
displayName: 'Platform-agnostic lints and checks' displayName: 'Platform-agnostic lints and checks'
@ -47,6 +56,9 @@ steps:
DAML_SCALA_VERSION: ${{parameters.scala_version}} DAML_SCALA_VERSION: ${{parameters.scala_version}}
ARTIFACTORY_USERNAME: $(ARTIFACTORY_USERNAME) ARTIFACTORY_USERNAME: $(ARTIFACTORY_USERNAME)
ARTIFACTORY_PASSWORD: $(ARTIFACTORY_PASSWORD) ARTIFACTORY_PASSWORD: $(ARTIFACTORY_PASSWORD)
condition: and(succeeded(),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
# Do not publish dar from m1 # Do not publish dar from m1
- ${{ if ne(parameters.name, 'm1') }}: - ${{ if ne(parameters.name, 'm1') }}:
@ -64,17 +76,23 @@ steps:
find . -type f | xargs gzip -9 find . -type f | xargs gzip -9
displayName: compress logs displayName: compress logs
condition: succeededOrFailed() condition: and(succeededOrFailed(),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
condition: succeededOrFailed() condition: and(succeededOrFailed(),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
continueOnError: true continueOnError: true
inputs: inputs:
pathtoPublish: '$(Build.StagingDirectory)/logs' pathtoPublish: '$(Build.StagingDirectory)/logs'
artifactName: 'Bazel Logs' artifactName: 'Bazel Logs'
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
condition: failed() condition: and(failed(),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
displayName: 'Publish the bazel test logs' displayName: 'Publish the bazel test logs'
inputs: inputs:
pathtoPublish: 'bazel-testlogs/' pathtoPublish: 'bazel-testlogs/'
@ -101,6 +119,9 @@ steps:
- template: bash-lib.yml - template: bash-lib.yml
parameters: parameters:
var_name: bash-lib var_name: bash-lib
condition: and(succeeded(),
or(eq(${{parameters.is_release}}, 'false'),
ne('${{parameters.name}}', 'm1')))
- bash: | - bash: |
set -euo pipefail set -euo pipefail
eval "$(./dev-env/bin/dade-assist)" eval "$(./dev-env/bin/dade-assist)"
@ -110,6 +131,7 @@ steps:
DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}} DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}}
name: publish name: publish
condition: and(succeeded(), condition: and(succeeded(),
ne('${{parameters.name}}', 'm1'),
eq(${{parameters.is_release}}, 'true'), eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'main')) eq(variables['Build.SourceBranchName'], 'main'))
- task: PublishPipelineArtifact@0 - task: PublishPipelineArtifact@0
@ -117,5 +139,6 @@ steps:
targetPath: $(Build.StagingDirectory)/release targetPath: $(Build.StagingDirectory)/release
artifactName: ${{parameters.name}}-release artifactName: ${{parameters.name}}-release
condition: and(succeeded(), condition: and(succeeded(),
ne('${{parameters.name}}', 'm1'),
eq(${{parameters.is_release}}, 'true'), eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'main')) eq(variables['Build.SourceBranchName'], 'main'))

View File

@ -40,13 +40,11 @@ jobs:
condition: and(succeeded(), eq(variables.is_release, 'true')) condition: and(succeeded(), eq(variables.is_release, 'true'))
- template: get-local-canton.yml - template: get-local-canton.yml
- template: clean-up.yml - template: clean-up.yml
# Do not build m1 on releases - template: build-unix.yml
- ${{ if or(eq(parameters.name, 'macos'), eq(variables.is_release, 'false')) }}: parameters:
- template: build-unix.yml release_tag: $(release_tag)
parameters: name: ${{parameters.name}}
release_tag: $(release_tag) is_release: variables.is_release
name: ${{parameters.name}}
is_release: variables.is_release
# Do not upload metrics for m1 # Do not upload metrics for m1
- ${{ if eq(parameters.name, 'macos') }}: - ${{ if eq(parameters.name, 'macos') }}:
- template: upload-bazel-metrics.yml - template: upload-bazel-metrics.yml