CLI: Allow binaries to autoupdate

.changeset/thick-bags-grab.md

@@ -0,0 +1,5 @@
+---
+"@xata.io/cli": patch
+---
+
+CLI: Allow binaries to autoupdate

.github/workflows/release-cli-assets.yml

@@ -7,17 +7,38 @@ on:
         description: 'Published packages'
         required: true
         type: string
+      commitSha:
+        description: 'Commit SHA'
+        required: true
+        type: string
   workflow_dispatch:
     inputs:
       publishedPackages:
         description: 'Published packages'
         required: true
         default: '[{"name": "@xata.io/cli", "version": "1.2.0"}]'
         type: string
+      commitSha:
+        description: 'Commit SHA'
+        required: true
+        type: string
+
+permissions:
+  id-token: write
+  contents: write
+  packages: write
+  pages: write
+  pull-requests: write
 
 jobs:
   release-cli-assets:
     name: Release CLI assets
+    outputs:
+      version: ${{ steps.capture-version.outputs.version }}
+      mac_intel_sha: ${{steps.sha-macos.outputs.sha-macos-intel}}
+      mac_arm_sha: ${{ steps.sha-macos.outputs.sha-macos-arm }}
+      linux_sha: ${{ steps.sha-ubuntu.outputs.sha-linux }}
+      linux_arm_sha: ${{ steps.sha-ubuntu.outputs.sha-linux-arm }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
@@ -81,14 +102,178 @@ jobs:
           sudo apt-get install -y nsis
           sudo apt-get install -y p7zip
 
-      - name: Release CLI Assets
-        run: pnpm run release:cli
+      - name: Configure AWS Credentials for production
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CLI_ASSETS_UPLOAD_ROLE }}
+          aws-region: us-east-1
+          mask-aws-account-id: 'no'
+
+      - name: Pack
+        run: pnpm run release:cli:pack
         env:
           PUBLISHED_PACKAGES: ${{ inputs.publishedPackages }}
           MATRIX_OS: ${{ matrix.os }}
+
+      - name: Upload CLI Assets to GitHub Releases
+        run: pnpm run release:cli:upload:gh
+        env:
+          MATRIX_OS: ${{ matrix.os }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Debian cert
+        if: matrix.os == 'ubuntu-latest'
+        working-directory: /home/runner/work/client-ts/client-ts/cli/dist/deb
+        run: |
+          echo "$DEBIAN_GPG_KEY_PRIVATE" | gpg --import --batch --passphrase "$DEBIAN_GPG_KEY_PASS"
+          gpg --digest-algo SHA512 --clearsign --pinentry-mode loopback --passphrase "$DEBIAN_GPG_KEY_PASS" -u $DEBIAN_GPG_KEY_ID -o InRelease Release 
+          gpg --digest-algo SHA512 -abs --pinentry-mode loopback --passphrase "$DEBIAN_GPG_KEY_PASS" -u $DEBIAN_GPG_KEY_ID -o Release.gpg Release 
+          echo "Signed debian packages successfully"
+          echo "sha256 sums:"
+          sha256sum *Release*
+
+          mkdir -p /home/runner/work/client-ts/client-ts/cli/dist/apt
+          echo "$DEBIAN_GPG_KEY_PUBLIC" > /home/runner/work/client-ts/client-ts/cli/dist/apt/release.key
+        env:
+          DEBIAN_GPG_KEY_PRIVATE: ${{ secrets.DEBIAN_GPG_KEY_PRIVATE }}
+          DEBIAN_GPG_KEY_PASS: ${{ secrets.DEBIAN_GPG_KEY_PASS }}
+          DEBIAN_GPG_KEY_PUBLIC: ${{ secrets.DEBIAN_GPG_KEY_PUBLIC }}
+          DEBIAN_GPG_KEY_ID: ${{ secrets.DEBIAN_GPG_KEY_ID }}
+
+      - name: Capture version
+        id: capture-version
+        working-directory: ./cli
+        run: echo "version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
+
+      - name: Create SHA outputs macos
+        if: matrix.os == 'macos-latest'
+        working-directory: ./cli/dist
+        id: sha-macos
+        run: |
+          ls -l
+          VER="${{steps.capture-version.outputs.version}}"
+          COMMITSHA="${{inputs.commitSha}}"
+          COM="$(echo $COMMITSHA | head -c8)"
+          echo "sha-macos-arm=$(shasum --algorithm 256 xata-v${VER}-${COM}-darwin-arm64.tar.xz | cut -d" " -f1)" >> "$GITHUB_OUTPUT"
+          echo "sha-macos-intel=$(shasum --algorithm 256 xata-v${VER}-${COM}-darwin-x64.tar.xz | cut -d" " -f1)" >> "$GITHUB_OUTPUT"
+
+      - name: Create SHA outputs ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        working-directory: ./cli/dist
+        id: sha-ubuntu
+        run: |
+          ls -l
+          VER="${{steps.capture-version.outputs.version}}"
+          COMMITSHA="${{inputs.commitSha}}"
+          COM="$(echo $COMMITSHA | head -c8)"
+          echo "sha-linux=$(sha256sum xata-v${VER}-${COM}-linux-arm.tar.xz | cut -d " " -f1)" >> "$GITHUB_OUTPUT"
+          echo "sha-linux-arm=$(sha256sum xata-v${VER}-${COM}-linux-arm64.tar.xz | cut -d " " -f1)" >> "$GITHUB_OUTPUT"
+
+      - name: Upload and Promote CLI Assets to S3
+        run: pnpm run release:cli:upload:s3
+        env:
+          MATRIX_OS: ${{ matrix.os }}
+          COMMIT_SHA: ${{ inputs.commitSha }}
+
+      - name: Pack (Windows only)
+        if: matrix.os == 'ubuntu-latest'
+        run: pnpm run release:cli:pack
+        env:
+          PUBLISHED_PACKAGES: ${{ inputs.publishedPackages }}
+          MATRIX_OS: ${{ matrix.os }}
+          OS_OVERRIDE: windows-latest
+      - name: Upload CLI Assets to GitHub Releases (Windows only)
+        run: pnpm run release:cli:upload:gh
+        if: matrix.os == 'ubuntu-latest'
+        env:
+          MATRIX_OS: ${{ matrix.os }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OS_OVERRIDE: windows-latest
+      - name: Upload and Promote CLI Assets to S3 (Windows only)
+        if: matrix.os == 'ubuntu-latest'
+        run: pnpm run release:cli:upload:s3
+        env:
+          MATRIX_OS: ${{ matrix.os }}
+          COMMIT_SHA: ${{ inputs.commitSha }}
+          OS_OVERRIDE: windows-latest
+
       - name: Clean up keychain
         if: matrix.os == 'macos-latest'
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+
+  update-homebrew:
+    needs: [release-cli-assets]
+    name: Update Homebrew Formula
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: xataio/homebrew-brew
+          ref: 'main'
+          token: ${{ secrets.GIT_TOKEN }}
+          fetch-depth: 0
+
+      - name: setup git config
+        run: |
+          git config user.email "[email protected]"
+          git config user.name "Xata"
+
+      - name: Read template file
+        id: gettemplate
+        run: |
+          {
+            echo 'template<<EOF'
+            cat ./Template/xata.rb
+            echo
+            echo EOF
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Update Homebrew Formula using template variables
+        id: updateformula
+        env:
+          TEMPLATE_CONTENTS: ${{ steps.gettemplate.outputs.template }}
+        run: |
+          echo "$TEMPLATE_CONTENTS" > ./Formula/xata.rb
+          sed -i 's/__CLI_VERSION__/${{ needs.release-cli-assets.outputs.version }}/g' ./Formula/xata.rb
+          sed -i 's/__CLI_MAC_INTEL_SHA256__/${{ needs.release-cli-assets.outputs.mac_intel_sha }}/g' ./Formula/xata.rb
+          sed -i 's/__CLI_MAC_ARM_SHA256__/${{ needs.release-cli-assets.outputs.mac_arm_sha }}/g' ./Formula/xata.rb
+          sed -i 's/__CLI_LINUX_SHA256__/${{ needs.release-cli-assets.outputs.linux_sha }}/g' ./Formula/xata.rb
+          sed -i 's/__CLI_LINUX_ARM_SHA256__/${{ needs.release-cli-assets.outputs.linux_arm_sha }}/g' ./Formula/xata.rb
+
+          VER="${{needs.release-cli-assets.outputs.version}}"
+          COMMITSHA="${{inputs.commitSha}}"
+          COM="$(echo $COMMITSHA | head -c8)"
+          BASE_URL="https://xata-cli-assets.s3.us-east-1.amazonaws.com/versions/${VER}/${COM}/xata-v${VER}-${COM}"
+
+          CLI_MAC_INTEL_DOWNLOAD_URL="${BASE_URL}-darwin-x64.tar.xz"
+          CLI_MAC_ARM_DOWNLOAD_URL="${BASE_URL}-darwin-arm64.tar.xz"
+          CLI_LINUX_DOWNLOAD_URL="${BASE_URL}-linux-x64.tar.xz"
+          CLI_LINUX_ARM_DOWNLOAD_URL="${BASE_URL}-linux-arm64.tar.xz"
+
+          sed -i "s|__CLI_MAC_INTEL_DOWNLOAD_URL__|${CLI_MAC_INTEL_DOWNLOAD_URL}|g" ./Formula/xata.rb
+          sed -i "s|__CLI_MAC_ARM_DOWNLOAD_URL__|${CLI_MAC_ARM_DOWNLOAD_URL}|g" ./Formula/xata.rb
+          sed -i "s|__CLI_LINUX_DOWNLOAD_URL__|${CLI_LINUX_DOWNLOAD_URL}|g" ./Formula/xata.rb
+          sed -i "s|__CLI_LINUX_ARM_DOWNLOAD_URL__|${CLI_LINUX_ARM_DOWNLOAD_URL}|g" ./Formula/xata.rb
+
+      - name: Read formula file
+        id: getformula
+        run: |
+          {
+            echo 'formula<<EOF'
+            cat ./Formula/xata.rb
+            echo
+            echo EOF
+          } >> "$GITHUB_OUTPUT"
+
+      - name: commit changes
+        run: git commit -a -m "Update dependencies to version ${{ needs.release-cli-assets.outputs.version }}"
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GIT_TOKEN }}
+          branch: main
+          repository: xataio/homebrew-brew

.github/workflows/release.yml

@@ -68,11 +68,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-  publish-cli-assets:
-    name: Publish CLI assets
+  release-assets:
+    name: Release CLI assets
     needs: [release]
-    if: needs.release.outputs.published == 'true'
+    if: needs.release.outputs.published == 'true' && github.ref_name == 'main'
     uses: ./.github/workflows/release-cli-assets.yml
     with:
       publishedPackages: ${{ needs.release.outputs.publishedPackages }}
+      commitSha: ${{ github.sha }}
     secrets: inherit

cli/package.json

@@ -18,11 +18,15 @@
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],
+  "engines": {
+    "node": ">=18"
+  },
   "dependencies": {
     "@oclif/core": "^4.0.8",
     "@oclif/plugin-help": "^6.2.5",
     "@oclif/plugin-not-found": "^3.2.10",
     "@oclif/plugin-plugins": "^5.3.4",
+    "@oclif/plugin-update": "^4.4.9",
     "@types/ini": "^4.1.1",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
@@ -40,18 +44,18 @@
     "enquirer": "^2.4.1",
     "env-editor": "^1.1.0",
     "ini": "^4.1.3",
-    "lodash.keyby": "^4.6.0",
     "lodash.compact": "^3.0.1",
     "lodash.get": "^4.4.2",
+    "lodash.keyby": "^4.6.0",
     "lodash.set": "^4.3.2",
     "node-fetch": "^3.3.2",
     "open": "^10.1.0",
     "prompts": "^2.4.2",
     "relaxed-json": "^1.0.3",
     "semver": "^7.6.2",
     "text-table": "^0.2.0",
-    "tslib": "^2.6.3",
     "tmp": "^0.2.3",
+    "tslib": "^2.6.3",
     "type-fest": "^4.21.0",
     "which": "^4.0.0",
     "zod": "^3.23.8"
@@ -77,6 +81,12 @@
   },
   "oclif": {
     "bin": "xata",
+    "update": {
+      "s3": {
+        "host": "https://xata-cli-assets.s3.us-east-1.amazonaws.com",
+        "bucket": "xata-cli-assets"
+      }
+    },
     "hooks": {
       "init": "./dist/hooks/init/compatibility"
     },
@@ -95,7 +105,8 @@
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-plugins",
-      "@oclif/plugin-not-found"
+      "@oclif/plugin-not-found",
+      "@oclif/plugin-update"
     ],
     "topicSeparator": " ",
     "topics": {

package.json

@@ -6,7 +6,9 @@
   "scripts": {
     "test": "vitest",
     "test:canary": "tsx ./scripts/test-canary.ts",
-    "release:cli": "tsx ./scripts/release-cli.ts",
+    "release:cli:pack": "tsx ./scripts/release-cli-pack.ts",
+    "release:cli:upload:gh": "tsx ./scripts/release-cli-upload-gh.ts",
+    "release:cli:upload:s3": "tsx ./scripts/release-cli-upload-s3.ts",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "prepare": "husky install",