Merge pull request #853 from danditomaso/ci/publish-workflow-updates

Refactor CI publish workflow and remove Rust support
2026-04-20 22:13:55 +00:00 · 2026-02-06 13:56:07 -06:00 · 2026-02-06 13:56:07 -06:00 · e80cb2e410
commit e80cb2e410
parent cba89ee2e9 491783b164
4 changed files with 207 additions and 78 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -1,4 +1,4 @@
-name: Publish to Cargo, JSR, & NPM
+name: Publish to JSR & NPM

 on:
  push:
@ -10,76 +10,88 @@ on:
        description: "Version to publish (e.g. v1.2.3). Used when manually dispatching."
        required: false
        type: string
+      dry_run:
+        description: "Dry run mode - generate artifacts without publishing"
+        required: false
+        type: boolean
+        default: false

-permissions: write-all
+permissions:
+  contents: write
+  id-token: write

 jobs:
  codegen:
    runs-on: ubuntu-24.04
+    outputs:
+      version: ${{ steps.version.outputs.VERSION }}
+      tag: ${{ steps.version.outputs.TAG }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0  
+          fetch-depth: 0

-      - name: Show files exist
-        run: |
-          set -euxo pipefail
-          ls -la packages/ts || true
-          ls -la packages/rust || true
-          cat packages/ts/deno.json
-          cat packages/ts/package.json
-          cat packages/rust/Cargo.toml
-
-      - name: Determine VERSION
+      - name: Determine version
+        id: version
        run: |
          set -euo pipefail
          if [ "${{ github.ref_type }}" = "tag" ]; then
-            VERSION="${{ github.ref_name }}"
+            TAG="${{ github.ref_name }}"
          elif [ -n "${{ inputs.version || '' }}" ]; then
-            VERSION="${{ inputs.version }}"
+            TAG="${{ inputs.version }}"
          else
            echo "No tag ref and no 'version' input. Provide a tag (push a tag) or pass inputs.version." >&2
            exit 1
          fi
-          # If you don't want the leading 'v' inside files, strip it:
-          STRIPPED="${VERSION#v}"
-          echo "VERSION=$STRIPPED" >> "$GITHUB_ENV"
-          echo "Resolved VERSION=$STRIPPED"
-
-      - name: Set Package Versions to current tag
-        run: |
-          set -euxo pipefail
-          for f in \
-            packages/ts/deno.json \
-            packages/ts/package.json \
-            packages/rust/Cargo.toml
-          do
-            test -f "$f" || { echo "Missing $f" >&2; exit 1; }
-            # replace __PACKAGE_VERSION__ with env VERSION
-            sed -i "s/__PACKAGE_VERSION__/${VERSION//\//-}/g" "$f"
-          done
+          VERSION="${TAG#v}"
+          echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "TAG=$TAG" >> "$GITHUB_OUTPUT"
+          echo "Resolved VERSION=$VERSION, TAG=$TAG"

      - name: Setup Buf
        uses: bufbuild/buf-setup-action@main
        with:
          github_token: ${{ github.token }}

-      - name: Generate code
+      - name: Generate protobuf code
        run: buf generate

-      - name: Copy license & README
+      - name: Move generated files to lib root
        run: |
-          cp LICENSE packages/ts
-          cp LICENSE packages/rust
-          cp README.md packages/ts
-          cp README.md packages/rust
+          set -euo pipefail
+          src_dir="packages/ts/lib/meshtastic"
+          dest_dir="packages/ts/lib"

-      - name: Upload Rust code
-        uses: actions/upload-artifact@v4
-        with:
-          name: rust_code
-          path: packages/rust
+          if [ ! -d "$src_dir" ]; then
+            echo "Expected source directory '$src_dir' does not exist. 'buf generate' may have failed or changed its output paths." >&2
+            exit 1
+          fi
+
+          if ! compgen -G "$src_dir"/*_pb.ts > /dev/null; then
+            echo "No '*_pb.ts' files found in '$src_dir'. 'buf generate' may have produced no TypeScript files or changed their naming." >&2
+            exit 1
+          fi
+
+          mv "$src_dir"/*_pb.ts "$dest_dir"/
+      - name: Show generated files
+        run: |
+          echo "=== packages/ts contents ==="
+          ls -la packages/ts/
+          echo "=== packages/ts/lib contents ==="
+          ls -la packages/ts/lib/ || echo "lib folder not found"
+
+      - name: Set package versions
+        run: |
+          set -euo pipefail
+          VERSION="${{ steps.version.outputs.VERSION }}"
+          for f in packages/ts/deno.json packages/ts/package.json; do
+            test -f "$f" || { echo "Missing $f" >&2; exit 1; }
+            sed -i "s/__PACKAGE_VERSION__/${VERSION}/g" "$f"
+          done
+
+      - name: Copy license & README
+        run: cp LICENSE README.md packages/ts/

      - name: Upload TypeScript code
        uses: actions/upload-artifact@v4
@ -87,46 +99,165 @@ jobs:
          name: ts_code
          path: packages/ts

-      - name: Push to schema registry
-        env:
-          BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
-        run: |
-          buf push --tag ${{ github.ref_name }}
-
-  publish-jsr:
+  build-typescript:
    runs-on: ubuntu-24.04
    needs: codegen
-    permissions:
-      contents: read
-      id-token: write
    steps:
      - name: Download TypeScript code
        uses: actions/download-artifact@v4
        with:
          name: ts_code
-      - name: Remove package.json (JSR doesn’t need it)
-        run: rm -f package.json
-      - name: Set up Deno
-        uses: denoland/setup-deno@main
-        with:
-          deno-version: rc
-      - name: Publish to JSR
-        run: deno publish --unstable-sloppy-imports

-  publish-cargo:
+      - name: Show downloaded files
+        run: |
+          echo "=== Working directory ==="
+          pwd
+          echo "=== Contents ==="
+          ls -la
+          echo "=== lib/ contents ==="
+          ls -la lib/ || echo "lib folder not found"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build with tsdown
+        run: npm run build
+
+      - name: Show build output
+        run: |
+          echo "=== Build output ==="
+          ls -la
+          ls -la dist/
+
+      - name: Upload built NPM package
+        uses: actions/upload-artifact@v4
+        with:
+          name: npm_package
+          path: |
+            dist/
+            package.json
+            LICENSE
+            README.md
+
+      - name: Upload JSR package
+        uses: actions/upload-artifact@v4
+        with:
+          name: jsr_package
+          path: |
+            lib/
+            mod.ts
+            deno.json
+            LICENSE
+            README.md
+
+  create-release-zips:
    runs-on: ubuntu-24.04
-    needs: codegen
+    needs: [codegen, build-typescript]
    steps:
-      - name: Download Rust code
+      - name: Download NPM package
        uses: actions/download-artifact@v4
        with:
-          name: rust_code
-      - name: Set up Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-      - name: Check Library
-        run: cargo check
-      - name: Publish to crates.io
-        uses: katyo/publish-crates@v2
+          name: npm_package
+          path: npm_package
+
+      - name: Download JSR package
+        uses: actions/download-artifact@v4
        with:
-          registry-token: ${{ secrets.CARGO_TOKEN }}
-          ignore-unpublished-changes: true
+          name: jsr_package
+          path: jsr_package
+
+      - name: Create zip archives
+        run: |
+          cd npm_package && zip -r ../meshtastic-protobufs-npm.zip . && cd ..
+          cd jsr_package && zip -r ../meshtastic-protobufs-jsr.zip . && cd ..
+
+      - name: Upload release zips
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_zips
+          path: |
+            meshtastic-protobufs-npm.zip
+            meshtastic-protobufs-jsr.zip
+
+  upload-release-assets:
+    runs-on: ubuntu-24.04
+    needs: [codegen, create-release-zips]
+    if: ${{ !inputs.dry_run }}
+    steps:
+      - name: Download release zips
+        uses: actions/download-artifact@v4
+        with:
+          name: release_zips
+
+      - name: Upload assets to GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ needs.codegen.outputs.tag }}
+          files: |
+            meshtastic-protobufs-npm.zip
+            meshtastic-protobufs-jsr.zip
+
+  push-buf-registry:
+    runs-on: ubuntu-24.04
+    needs: codegen
+    if: ${{ !inputs.dry_run }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Buf
+        uses: bufbuild/buf-setup-action@main
+        with:
+          github_token: ${{ github.token }}
+
+      - name: Push to schema registry
+        env:
+          BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
+        run: buf push --tag ${{ needs.codegen.outputs.tag }}
+
+  publish-npm:
+    runs-on: ubuntu-24.04
+    needs: [codegen, build-typescript]
+    if: ${{ !inputs.dry_run }}
+    steps:
+      - name: Download NPM package
+        uses: actions/download-artifact@v4
+        with:
+          name: npm_package
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Publish to NPM
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  publish-jsr:
+    runs-on: ubuntu-24.04
+    needs: [codegen, build-typescript]
+    if: ${{ !inputs.dry_run }}
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Download JSR package
+        uses: actions/download-artifact@v4
+        with:
+          name: jsr_package
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Publish to JSR
+        run: npx jsr publish
--- a/.github/workflows/schema-registry.yml
+++ b/.github/workflows/schema-registry.yml
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,4 @@
 .DS_Store
+
+# Generated protobuf files
+packages/ts/lib/
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@ -3,8 +3,3 @@ plugins:
  - remote: buf.build/bufbuild/es:v2.1.0
    out: packages/ts/lib
    opt: target=ts
-  - remote: buf.build/community/neoeinstein-prost:v0.4.0
-    out: packages/rust/src/generated
-  - remote: buf.build/community/neoeinstein-prost-crate:v0.4.1
-    out: packages/rust/src/generated
-    opt: no_features