Skip to content

Commit

Permalink
Add artifactory & SDK EE artifacts to split-release process (#12345)
Browse files Browse the repository at this point in the history
Apologies for doing two things in one PR but they seemed somewhat
entangled.

For artifactory we follow the approach we use for Maven artifacts and
publish there directly.

For the SDK EE tarball, we just throw it in the split-release
directory and then the assembly repo can pick it up.

changelog_begin
changelog_end
  • Loading branch information
cocreature authored Jan 11, 2022
1 parent e4dbde3 commit 79428bb
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 8 deletions.
23 changes: 23 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,24 @@ jobs:
artifactName: windows-release
targetPath: $(Build.StagingDirectory)/release-artifacts
condition: and(succeeded(), not(eq(variables['skip-github'], 'TRUE')))
- bash: |
set -euo pipefail
KEY_FILE=$(mktemp)
GPG_DIR=$(mktemp -d)
cleanup() {
rm -rf $KEY_FILE $GPG_DIR
}
trap cleanup EXIT
echo "$GPG_KEY" | base64 -d > $KEY_FILE
gpg --homedir $GPG_DIR --no-tty --quiet --import $KEY_FILE
# For now we only sign artifactory artifacts here and leave signing of artifacts
# published to GH to the assembly repo.
cd $(Build.StagingDirectory)/release-artifacts/artifactory
for f in *; do
gpg --homedir $GPG_DIR -ab $f
done
env:
GPG_KEY: $(gpg-code-signing)
- bash: |
set -eou pipefail
eval "$(./dev-env/bin/dade-assist)"
Expand All @@ -208,6 +226,11 @@ jobs:
name: upload_to_gcs
env:
GCRED: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT)
- bash: |
set -euo pipefail
./ci/publish-artifactory.sh $(Build.StagingDirectory) $(release_tag) split
env:
AUTH: $(ARTIFACTORY_USERNAME):$(ARTIFACTORY_PASSWORD)
- template: ci/tell-slack-failed.yml
parameters:
trigger_sha: '$(trigger_sha)'
Expand Down
3 changes: 3 additions & 0 deletions ci/copy-unix-release-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ TARBALL=daml-sdk-$RELEASE_TAG-$NAME.tar.gz
EE_TARBALL=daml-sdk-$RELEASE_TAG-$NAME-ee.tar.gz
bazel build //release:sdk-release-tarball-ce //release:sdk-release-tarball-ee
cp bazel-bin/release/sdk-release-tarball-ce.tar.gz $OUTPUT_DIR/github/$TARBALL
# Used for the non-split release process.
cp bazel-bin/release/sdk-release-tarball-ee.tar.gz $OUTPUT_DIR/artifactory/$EE_TARBALL
# Used for the split release process.
cp bazel-bin/release/sdk-release-tarball-ee.tar.gz $OUTPUT_DIR/split-release/$EE_TARBALL


bazel build //compiler/damlc:damlc-dist
Expand Down
4 changes: 4 additions & 0 deletions ci/copy-windows-release-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ OUTPUT_DIR=$2

mkdir -p $OUTPUT_DIR/github
mkdir -p $OUTPUT_DIR/artifactory
mkdir -p $OUTPUT_DIR/split-release
INSTALLER="$OUTPUT_DIR/github/daml-sdk-$RELEASE_TAG-windows.exe"
EE_INSTALLER="$OUTPUT_DIR/artifactory/daml-sdk-$RELEASE_TAG-windows-ee.exe"
mv "bazel-bin/release/windows-installer/daml-sdk-installer-ce.exe" "$INSTALLER"
Expand Down Expand Up @@ -36,4 +37,7 @@ fi
TARBALL=daml-sdk-$RELEASE_TAG-windows.tar.gz
EE_TARBALL=daml-sdk-$RELEASE_TAG-windows-ee.tar.gz
cp bazel-bin/release/sdk-release-tarball-ce.tar.gz "$OUTPUT_DIR/github/$TARBALL"
# Used for the non-split release process.
cp bazel-bin/release/sdk-release-tarball-ee.tar.gz "$OUTPUT_DIR/artifactory/$EE_TARBALL"
# Used for the split release process.
cp bazel-bin/release/sdk-release-tarball-ee.tar.gz "$OUTPUT_DIR/split-release/$EE_TARBALL"
19 changes: 11 additions & 8 deletions ci/publish-artifactory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@ for base in non-repudiation-core non-repudiation-client; do
done
done

for platform in linux macos windows; do
EE_TARBALL=daml-sdk-$RELEASE_TAG-$platform-ee.tar.gz
push sdk-ee $EE_TARBALL
push sdk-ee $EE_TARBALL.asc
done
EE_INSTALLER=daml-sdk-$RELEASE_TAG-windows-ee.exe
push sdk-ee $EE_INSTALLER
push sdk-ee $EE_INSTALLER.asc
# For the split release process these are not published to artifactory.
if [[ "$#" -lt 3 || $3 != "split" ]]; then
for platform in linux macos windows; do
EE_TARBALL=daml-sdk-$RELEASE_TAG-$platform-ee.tar.gz
push sdk-ee $EE_TARBALL
push sdk-ee $EE_TARBALL.asc
done
EE_INSTALLER=daml-sdk-$RELEASE_TAG-windows-ee.exe
push sdk-ee $EE_INSTALLER
push sdk-ee $EE_INSTALLER.asc
fi

0 comments on commit 79428bb

Please sign in to comment.