Testing latest release tag and build_sha

Author: jameskerr

.github/workflows/release-insiders.yml

@@ -60,3 +60,6 @@ jobs:
               "username": "{{GITHUB_REPOSITORY}}",
               "text": "Release failed: https://github.com/{{GITHUB_REPOSITORY}}/actions/runs/{{GITHUB_RUN_ID}}"
             }
+  record_sha:
+    name: Record the current build sha on the newly created release
+    runs_on: ubuntu-20.04

.github/workflows/test-upload-build-sha.yml

@@ -10,12 +10,20 @@ jobs:
     name: Upload the Build Shaw
     runs-on: ubuntu-20.04
     steps:
-      - run: '[[ ${{github.sha}} == $(curl -L https://github.com/brimdata/zui-insiders/releases/download/v1.2.1-0/sha.txt) ]]'
-    #   - run: echo ${{ github.sha }} > sha.txt
-    #   - name: Upload Sha File To Release
-    #     uses: svenstaro/upload-release-action@v2
-    #     with:
-    #       file: sha.txt
-    #       tag: v1.2.1-0
-    #       repo_name: brimdata/zui-insiders
-    #       repo_token: ${{ secrets.PAT_TOKEN }}
+      - name: Create the build_sha file
+        run: echo ${{ github.sha }} > build_sha.txt
+
+      - name: Get Latest Release Tag
+        id: latest
+        uses: pozetroninc/[email protected]
+        with:
+          owner: brimdata
+          repo: zui-insiders
+
+      - name: Upload build_sha File to Release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          file: build_sha.txt
+          tag: ${{ steps.latest.outputs.release }}
+          repo_name: brimdata/zui-insiders
+          repo_token: ${{ secrets.PAT_TOKEN }}

apps/insiders/package.json

@@ -4,11 +4,14 @@
   "version": "0.0.1",
   "type": "commonjs",
   "scripts": {
+    "latest-version": "ts-node src/latest-version",
     "inject": "ts-node src/inject",
     "assert-update-needed": "ts-node src/update-needed"
   },
   "devDependencies": {
+    "@types/node-fetch": "^2.6.2",
     "fs-extra": "^10.1.0",
+    "node-fetch": "^2.6.2",
     "octokit": "2.1.0",
     "semver": "^7.3.7"
   }

apps/insiders/src/commit.ts

@@ -1,7 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import * as semver from 'semver';
-import { getCurrentCommitHash } from './commit';
 
 const p = (...args: unknown[]) => console.log('‣', ...args);
 
@@ -43,7 +42,7 @@ export class InsidersPackager {
         ? this.stableVersion
         : semver.inc(this.lastVersion, 'prerelease');
 
-    return version + '+' + getCurrentCommitHash();
+    return version;
   }
 
   get strategy() {

apps/insiders/src/insiders-packager.ts

@@ -0,0 +1,8 @@
+import { getLatestInsidersVersion } from './latest';
+
+async function main() {
+  const latest = await getLatestInsidersVersion();
+  console.log(latest);
+}
+
+main();

apps/insiders/src/latest-version.ts

@@ -1,12 +1,29 @@
 import { Octokit } from 'octokit';
+import fetch from 'node-fetch';
 
 const gh = new Octokit();
 
 export async function getLatestInsidersVersion() {
-  const release = await gh.rest.repos.getLatestRelease({
+  const release = await getRelease();
+  // Remove the v
+  return release.data.tag_name.slice(1);
+}
+
+export async function getLatestInsidersSha() {
+  const release = await getRelease();
+  const { tag_name } = release.data;
+  const resp = await fetch(shaUrl(tag_name));
+  const sha = await resp.text();
+  return sha.trim();
+}
+
+function shaUrl(tag: string) {
+  return `https://github.com/brimdata/zui-insiders/releases/download/${tag}/sha.txt`;
+}
+
+function getRelease() {
+  return gh.rest.repos.getLatestRelease({
     owner: 'brimdata',
     repo: 'zui-insiders',
   });
-
-  return release.data.tag_name.slice(1); // Remove the v
 }

apps/insiders/src/latest.ts

@@ -1,27 +1,17 @@
-import { getCurrentCommitHash } from './commit';
-import { getLatestInsidersVersion } from './latest';
-import * as semver from 'semver';
+import { getLatestInsidersSha } from './latest';
 
-function extractCommitFromVersion(version: string) {
-  const parts = semver.parse(version);
+async function main() {
+  const currentSha = process.env['GITHUB_SHA'];
+  const releaseSha = await getLatestInsidersSha();
 
-  if (parts && parts.build.length === 1) {
-    return parts.build[0];
-  } else {
-    return null;
-  }
-}
+  console.log('Last Release:', releaseSha);
+  console.log('     Current:', currentSha);
 
-async function main() {
-  const version = await getLatestInsidersVersion();
-  const head = getCurrentCommitHash();
-  const lastCommit = extractCommitFromVersion(version);
-  const updateNeeded = !(head === lastCommit);
-  if (updateNeeded) {
-    console.log('Update needed');
-  } else {
-    console.log('Update not needed');
+  if (releaseSha.trim() === currentSha) {
+    console.log('No Update Needed');
     process.exit(1);
+  } else {
+    console.log('Continue Update');
   }
 }
 

apps/insiders/src/update-needed.ts

@@ -10807,7 +10807,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "insiders@workspace:apps/insiders"
   dependencies:
+    "@types/node-fetch": ^2.6.2
     fs-extra: ^10.1.0
+    node-fetch: ^2.6.2
     octokit: 2.1.0
     semver: ^7.3.7
   languageName: unknown