feat: switch to "main" from trunk

Drop the candidate-3.x.x branch for new CI pipeline

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [trunk, b*, candidate-*]
+    branches: [main, b*]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [trunk]
+    branches: [main]
   schedule:
     - cron: "34 1 * * 2"
 

.github/workflows/release-please.yml

@@ -1,3 +1,5 @@
+name: PR Test and Release
+
 on:
   push:
     branches:
@@ -6,15 +8,13 @@ on:
 
   pull_request:
     branches:
-      - maqin
+      - main
       - candidate-*
 
 permissions:
   contents: write
   pull-requests: write
 
-name: PR Test and Release
-
 jobs:
   release-please:
     runs-on: ubuntu-latest
@@ -81,7 +81,7 @@ jobs:
         run: |
           git config user.name github-actions[bot]
           git config user.email 4104672+github-actions[bot]@users.noreply.github.com
-          git remote add gh-token "https://${{ secrets.GITHUB_TOKEN}}@github.com/yargs/yargs.git"
+          git remote add gh-token "https://${{ secrets.GITHUB_TOKEN}}@github.com/hpcc-systems/Visualization.git"
           git commit -a -m 'chore: stamp files for release'
           git push origin
 

.github/workflows/update-docs.yml

@@ -2,7 +2,7 @@ name: Update gh-pages
 
 on:
   push:
-    branches: [trunk, trunk-future]
+    branches: [main, trunk-future]
 
 jobs:
   build:

.release-please-manifest.json

@@ -7,7 +7,7 @@
     "packages/comms": "3.10.0",
     "packages/composite": "3.3.0",
     "packages/dataflow": "9.4.3",
-    "packages/ddl-shim": "2.24.0",
+    "packages/ddl-shim": "3.0.0",
     "packages/dgrid": "3.4.0",
     "packages/dgrid-shim": "3.2.0",
     "packages/dgrid2": "3.3.2",
@@ -23,7 +23,7 @@
     "packages/other": "3.3.0",
     "packages/phosphor": "3.2.13",
     "packages/react": "3.3.2",
-    "packages/timeline": "2.56.0",
-    "packages/tree": "2.44.0",
+    "packages/timeline": "3.0.0",
+    "packages/tree": "3.0.0",
     "packages/util": "3.3.12"
 }

lerna.json

@@ -7,11 +7,11 @@
         "__package__.ts",
         "*.md"
       ],
-      "allowBranch": "trunk"
+      "allowBranch": "main"
     },
     "publish": {}
   },
   "version": "independent",
   "npmClient": "npm",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/ddl-shim",
-    "version": "2.24.0",
+    "version": "3.0.0",
     "description": "hpcc-js DDL parser",
     "type": "module",
     "main": "./dist/index.umd.cjs",

packages/ddl-shim/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/timeline",
-    "version": "2.56.0",
+    "version": "3.0.0",
     "description": "hpcc-js - Viz Timeline",
     "type": "module",
     "main": "./dist/index.umd.cjs",

packages/timeline/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/tree",
-    "version": "2.44.0",
+    "version": "3.0.0",
     "description": "hpcc-js - Viz Tree",
     "type": "module",
     "main": "./dist/index.umd.cjs",