From 54f7b7bc03a35eff95a8dd7e955ec7e97137d980 Mon Sep 17 00:00:00 2001 From: Brice Redmond Date: Mon, 11 Nov 2024 14:04:29 -0800 Subject: [PATCH] [other] a couple more deploy cleanups --- .github/workflows/deploy-release.yml | 1 + CHANGELOG.md | 2 ++ Makefile | 1 - deployment/release-s3.sh | 2 +- examples/example.template.html | 3 ++- src/0_config.js | 3 ++- test/web-config.js | 3 ++- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index eed558d5..48a54fd1 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -61,6 +61,7 @@ jobs: with: node-version: ${{ env.NODE_VERSION }} + # Do this before npm configure because it writes the package.json version - name: Write version to files run: | ./deployment/write-versions.sh ${{ steps.next-version.outputs.result }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 2df8413b..a276ef92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to the Branch Web SDK will be documented here. The Branch Web SDK adheres to [Semantic Versioning](http://semver.org/). ## [VERSION] - unreleased +## [2.85.2] - 2024-11-11 +- Updates release process ## [2.85.1] - 2024-11-04 - Updates qr image download to avoid errors ## [2.85.0] - 2024-04-10 diff --git a/Makefile b/Makefile index 65e8ce5b..0321a8b1 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,6 @@ all: dist/build.min.js dist/build.js test/branch-deps.js test/integration-test.h clean: rm -f dist/** docs/web/3_branch_web.md test/branch-deps.js dist/build.min.js.gz test/integration-test.html release: clean all dist/build.min.js.gz - @echo "released" test/branch-deps.js: $(SOURCES) npx closure-make-deps \ diff --git a/deployment/release-s3.sh b/deployment/release-s3.sh index 68de6b43..e1937a37 100755 --- a/deployment/release-s3.sh +++ b/deployment/release-s3.sh @@ -14,6 +14,7 @@ make release aws s3 cp example.html s3://branch-builds/example.html aws s3 cp example.html s3://branch-cdn/example.html +aws s3 cp --content-type="text/javascript" --content-encoding="gzip" dist/build.js s3://branch-cdn/branch-latest.js --cache-control "max-age=300" aws s3 cp --content-type="text/javascript" --content-encoding="gzip" dist/build.min.js.gz s3://branch-cdn/branch-$VERSION.min.js --cache-control "max-age=300" aws s3 cp --content-type="text/javascript" --content-encoding="gzip" dist/build.min.js.gz s3://branch-cdn/branch-latest.min.js --cache-control "max-age=300" @@ -21,7 +22,6 @@ echo -en "Invalidating cloudfront distribution...\n" aws configure set preview.cloudfront true aws cloudfront create-invalidation --distribution-id E10P37NG0GMER --paths /branch-latest.min.js - echo "Post-release sanity checks." read -p "Can you visit https://cdn.branch.io/branch-$VERSION.min.js ?" -n 1 -r echo diff --git a/examples/example.template.html b/examples/example.template.html index 34fe4c29..d00795ec 100644 --- a/examples/example.template.html +++ b/examples/example.template.html @@ -250,7 +250,8 @@

QR Code

"background_color": "#FFFFFF", "margin": 5, "width": 1000, - "image_format": "png" + "image_format": "png", + "center_logo_url": "https://branch-assets.s3.us-west-1.amazonaws.com/branch-badge-dark.svg", }; var qrCodeParams = { tags: [ 'tag1', 'tag2' ], diff --git a/src/0_config.js b/src/0_config.js index 70262e48..12e7d959 100644 --- a/src/0_config.js +++ b/src/0_config.js @@ -8,4 +8,5 @@ var DEFAULT_API_ENDPOINT = 'https://api2.branch.io'; config.app_service_endpoint = 'https://app.link'; config.link_service_endpoint = 'https://bnc.lt'; config.api_endpoint = DEFAULT_API_ENDPOINT; -config.version = '2.85.1'; // will get overwritten by gha on actual deploy +// will get overwritten by gha on actual deploy +config.version = '2.85.2'; diff --git a/test/web-config.js b/test/web-config.js index 9636fd6c..0f5d97b1 100644 --- a/test/web-config.js +++ b/test/web-config.js @@ -6,4 +6,5 @@ goog.provide('config'); config.app_service_endpoint = 'https://app.link'; config.link_service_endpoint = 'https://bnc.lt'; config.api_endpoint = 'https://api.branch.io'; -config.version = '2.85.1'; // will get overwritten by gha on actual deploy +// will get overwritten by gha on actual deploy +config.version = '2.85.2';