Merge pull request #11 from ProvableHQ/josh/unstick-watch-leo-tags

ci: unstick watch-leo-tags cron and catch master up to leo v4.0.2

Author: JoshuaBatty

.github/workflows/watch-leo-tags.yml

@@ -4,8 +4,9 @@
 #   from the selected Leo ref.
 # - Pushes changes to the fixed automation branch `automation/sync-leo-release`.
 # - Opens or updates a reviewable PR; it does not publish the extension.
-# - Requires `LEO_REPO_READ_TOKEN` (`contents: read`) for cross-repo access to
-#   `ProvableHQ/leo`.
+# - Reads `ProvableHQ/leo` via the auto-issued `GITHUB_TOKEN` (sufficient because
+#   `ProvableHQ/leo` is public). `LEO_REPO_READ_TOKEN` is honored when present
+#   for higher API rate limits or future private-repo support.
 
 name: Watch Leo Tags
 
@@ -42,24 +43,10 @@ jobs:
         with:
           node-version: 20
 
-      - name: Check Leo source token availability
-        id: auth
-        env:
-          LEO_REPO_READ_TOKEN: ${{ secrets.LEO_REPO_READ_TOKEN }}
-        run: |
-          if [ -z "$LEO_REPO_READ_TOKEN" ]; then
-            echo "enabled=false" >>"$GITHUB_OUTPUT"
-            echo "LEO_REPO_READ_TOKEN is not configured. Skipping Leo sync."
-            exit 0
-          fi
-
-          echo "enabled=true" >>"$GITHUB_OUTPUT"
-
       - name: Resolve Leo sync target
         id: target
-        if: steps.auth.outputs.enabled == 'true'
         env:
-          GH_TOKEN: ${{ secrets.LEO_REPO_READ_TOKEN }}
+          GH_TOKEN: ${{ secrets.LEO_REPO_READ_TOKEN || github.token }}
         run: |
           set -euo pipefail
 
@@ -77,11 +64,11 @@ jobs:
           "${args[@]}"
 
       - name: Stop when no sync is needed
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync != 'true'
+        if: steps.target.outputs.should_sync != 'true'
         run: echo "No new Leo release tag needs syncing."
 
       - name: Check whether the automation branch already targets this ref
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync == 'true'
+        if: steps.target.outputs.should_sync == 'true'
         id: branch_state
         env:
           SYNC_BRANCH: ${{ steps.target.outputs.sync_branch }}
@@ -105,26 +92,26 @@ jobs:
           echo "already_prepared=false" >>"$GITHUB_OUTPUT"
 
       - name: Stop when the automation branch is already up to date
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared == 'true'
+        if: steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared == 'true'
         run: echo "An automation branch already exists for this Leo release ref."
 
       - name: Checkout Leo repo
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true'
+        if: steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true'
         uses: actions/checkout@v5
         with:
           repository: ProvableHQ/leo
           path: leo
           fetch-depth: 0
-          token: ${{ secrets.LEO_REPO_READ_TOKEN }}
+          token: ${{ secrets.LEO_REPO_READ_TOKEN || github.token }}
 
       - name: Configure git author
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true'
+        if: steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true'
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
       - name: Sync syntax artifacts from the selected Leo ref
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true'
+        if: steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true'
         id: sync
         env:
           DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
@@ -155,11 +142,11 @@ jobs:
           echo "has_changes=true" >>"$GITHUB_OUTPUT"
 
       - name: Stop when the selected Leo ref produces no repo changes
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true' && steps.sync.outputs.has_changes != 'true'
+        if: steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true' && steps.sync.outputs.has_changes != 'true'
         run: echo "Sync completed but produced no changes to commit."
 
       - name: Create or update the sync pull request
-        if: steps.auth.outputs.enabled == 'true' && steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true' && steps.sync.outputs.has_changes == 'true'
+        if: steps.target.outputs.should_sync == 'true' && steps.branch_state.outputs.already_prepared != 'true' && steps.sync.outputs.has_changes == 'true'
         env:
           DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
           GH_TOKEN: ${{ github.token }}

packages/shared/syntaxes/prism-leo.js

@@ -1,7 +1,7 @@
 // Generated from Leo tree-sitter syntax data. Do not edit by hand.
 // Source repo: ProvableHQ/leo
-// Source ref: v4.0.1
-// Resolved commit: abe1e1e8e5dd48ae5a849a94c802175419bebb30
+// Source ref: v4.0.2
+// Resolved commit: 13448848d9509c32b4541fda6b498b0fee703eab
 
 Prism.languages.leo = {
   "comment": [
@@ -76,7 +76,7 @@ Prism.languages.leo = {
     }
   ],
   "keyword": new RegExp("\\b(?:assert_neq|assert_eq|interface|mapping|network|program|storage|assert|import|record|return|struct|block|const|final|Final|aleo|else|self|for|let|as|fn|Fn|if|in)\\b"),
-  "type-keyword": new RegExp("\\b(?:signature|address|scalar|string|field|group|bool|i128|u128|i16|i32|i64|u16|u32|u64|i8|u8)\\b"),
+  "type-keyword": new RegExp("\\b(?:identifier|signature|address|scalar|string|field|group|bool|i128|u128|i16|i32|i64|u16|u32|u64|i8|u8)\\b"),
   "bool-keyword": new RegExp("\\b(?:false|true)\\b"),
   "builtin-constant": [
     {

packages/vscode/generated-from-leo.json

@@ -1,6 +1,6 @@
 {
   "sourceRepo": "ProvableHQ/leo",
   "sourcePath": "tree-sitter",
-  "sourceRef": "v4.0.1",
-  "resolvedCommit": "abe1e1e8e5dd48ae5a849a94c802175419bebb30"
+  "sourceRef": "v4.0.2",
+  "resolvedCommit": "13448848d9509c32b4541fda6b498b0fee703eab"
 }

packages/vscode/syntaxes/leo.tmLanguage.json

@@ -213,7 +213,7 @@
       "patterns": [
         {
           "name": "storage.type.primitive.leo",
-          "match": "\\b(?:signature|address|scalar|string|field|group|bool|i128|u128|i16|i32|i64|u16|u32|u64|i8|u8)\\b"
+          "match": "\\b(?:identifier|signature|address|scalar|string|field|group|bool|i128|u128|i16|i32|i64|u16|u32|u64|i8|u8)\\b"
         }
       ]
     },