Merge pull request #194 from ably/restructure-scripts

Restructure scripts & GH actions

.github/workflows/release-tag.yml → .github/workflows/release.yml

@@ -1,15 +1,14 @@
-name: Release Ably UI
+name: Release packages
+
 on:
   release:
     types: [published]
 
 jobs:
-  run-script:
+  release:
     runs-on: ubuntu-latest
     permissions:
-      packages: write
-      contents: "read"
-      pull-requests: "write"
+      contents: "write"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -22,10 +21,6 @@ jobs:
         with:
           node-version: "14.15.4"
       - run: npm install -g yarn
-      - name: Grant permissions to Scripts
-        run: |
-          chmod +x "release.sh"
-          chmod +x "./scripts/update-dependents.sh"
       - name: Release latest Ably UI version
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -35,9 +30,3 @@ jobs:
           git config --global user.name "Github Action"
           ./scripts/release.sh "${GITHUB_REF/refs\/tags\//}"
         shell: bash
-      - name: Create PR on Voltaire and Website
-        env:
-          REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
-          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-        run: "./scripts/update-dependents.sh"
-        shell: bash

.github/workflows/update-dependents.yml

@@ -0,0 +1,18 @@
+name: Update dependents
+
+on:
+  workflow_run:
+    workflows: ["Release packages"]
+    types:
+      - completed
+
+jobs:
+  open-prs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create PR on Voltaire and Website
+        env:
+          REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        run: "./scripts/update-dependents.sh"
+        shell: bash

.github/workflows/update-preview.yml

@@ -0,0 +1,32 @@
+name: Update preview
+
+on:
+  workflow_run:
+    workflows: ["Release packages"]
+    types:
+      - completed
+
+jobs:
+  update_preview:
+    needs: release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: "write"
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: "main"
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.0
+          bundler-cache: true
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14.15.4"
+            - run: npm install -g yarn
+      - name: Update preview app
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Github Action"
+          ./scripts/update-preview.sh "${git describe --abbrev=0}"
+        shell: bash

scripts/release.sh

@@ -5,7 +5,6 @@ set -euo pipefail
 env
 
 VERSION=$1
-TAG=v$1
 
 echo "Install packages, making sure they are up to date"
 yarn --frozen-lockfile
@@ -47,27 +46,9 @@ rm ably-ui-$VERSION.gem
 echo "Publish the npm package to the registry"
 yarn publish --no-git-tag-version --new-version $VERSION
 
-echo "Waiting to make sure packages are available in registries ;("
-sleep 180
-
-echo "Update preview app version"
-cd preview
-
-echo "Update Gemfile"
-sed -i.bak "s/gem 'ably-ui', '.*', require/gem 'ably-ui', '${VERSION}', require/" Gemfile
-rm Gemfile.bak
-
-echo "Update ably-ui npm package in preview app"
-yarn upgrade @ably/ui@$VERSION
-
-echo "Update Gemfile.lock"
-bundle lock  # don't change contents gem dir as it might be using local paths
-
-echo "Commit version publish and preview app update to $TAG"
-cd ..
+echo "Commit version publish"
 git add package.json lib/ably_ui/version.rb Gemfile.lock
-git add preview/package.json preview/yarn.lock preview/Gemfile preview/Gemfile.lock
-git commit -m "Commit version bump & preview app update"
+git commit -m "Commit version bump to $VERSION"
 
 echo "Push main to origin"
 git push origin main

scripts/update-preview.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# See https://coderwall.com/p/fkfaqq/safer-bash-scripts-with-set-euxo-pipefail
+set -euo pipefail
+env
+
+VERSION=$1
+
+echo "Update preview app version"
+cd preview
+
+echo "Amend Gemfile to use the right version"
+sed -i.bak "s/gem 'ably-ui', '.*', require/gem 'ably-ui', '${VERSION}', require/" Gemfile
+rm Gemfile.bak
+
+echo "Upgrade ably-ui npm package in preview app"
+yarn upgrade @ably/ui@$VERSION
+
+echo "Upgrade ably-ui ruby gem in preview app"
+bundle lock  # don't change contents gem dir as it might be using local paths
+
+echo "Commit preview app update to $VERSION"
+cd ..
+git add preview/package.json preview/yarn.lock preview/Gemfile preview/Gemfile.lock
+git commit -m "Update preview app to ably-ui $VERSION"
+
+echo "Push to origin"
+git push origin main