feat: switch to "main" from trunk

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

Signed-off-by: Gordon Smith <[email protected]>

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

.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:

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",