[patch] fix release.sh

2 problems:
- the s3 publishes should not have had acl (i got this from what was there before)
- the npm publish needs a valid token

Author: bredmond5

.github/workflows/build-push.yml

@@ -25,6 +25,10 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRIBUTION }}
 
+      - name: Write version to files
+        run: |
+          ./deployment/write-versions.sh ${{ steps.next-version.outputs.result }}
+
       - name: Install dependencies
         run: npm run ci
 
@@ -100,11 +104,6 @@ jobs:
         env:
           INPUT_SHA: ${{ env.INPUT_SHA }}
 
-      - name: Write version to files
-        if: ${{ github.ref == 'refs/heads/master' }}
-        run: |
-          ./deployment/write-versions.sh ${{ steps.next-version.outputs.result }}
-
       - name: Deploy updated builds to staging
         if: ${{ github.ref == 'refs/heads/master' }}
         id: build

.github/workflows/deploy-release.yml

@@ -68,9 +68,16 @@ jobs:
       - name: Configure NPM
         run: npm ci
 
-      - name: Release to npm, s3, prod
+      - run: make release
+
+      - name: Publish to s3
         run: |
-          ./deployment/release.sh ${{ steps.next-version.outputs.result }}
+          ./deployment/release-s3.sh ${{ steps.next-version.outputs.result }}
+
+      - name: Publish to npm
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISHER_TOKEN }}
+        run: npm publish
 
       - name: Create Github Release
         uses: actions/github-script@v7

deployment/release.sh deployment/release-s3.shdeployment/release.sh renamed to deployment/release-s3.sh

@@ -12,15 +12,15 @@ make release
 
 ./deployment/build-example-html.sh "key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB" "https://api2.branch.io" "https://cdn.branch.io/branch-latest.min.js"
 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.min.js.gz s3://branch-cdn/branch-$VERSION.min.js --acl public-read
-aws s3 cp --content-type="text/javascript" --content-encoding="gzip" dist/build.min.js.gz s3://branch-cdn/branch-latest.min.js --acl public-read
+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"
 
 echo -en "Invalidating cloudfront distribution...\n"
 aws configure set preview.cloudfront true
 aws cloudfront create-invalidation --distribution-id E10P37NG0GMER --paths /branch-latest.min.js
 
-npm publish
 
 echo "Post-release sanity checks."
 read -p "Can you visit https://cdn.branch.io/branch-$VERSION.min.js ?" -n 1 -r