Merge branch 'develop' into siteID-refactor

PecanProject · Sep 15, 2024 · f6390eb · f6390eb
2 parents a4025a8 + e31bc0a
commit f6390eb
Show file tree

Hide file tree

Showing 344 changed files with 1,822 additions and 3,281 deletions.
diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
@@ -3,7 +3,7 @@ name: renderbook
 on:
   push:
     branches:
-      - master
+      - main
       - develop
     tags:
       - '*'
@@ -65,9 +65,12 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "GitHub Documentation Robot"
         export VERSION=$(echo $GITHUB_REF | sed 's,.*/,,' )
+        if [ "$VERSION" == "main" ]; then
+          export VERSION=latest
+        fi
         cd pecan-documentation
         mkdir -p $VERSION
         rsync -a --delete ../book_source/_book/ ${VERSION}/
         git add --all *
         git commit -m "Build book from pecan revision ${GITHUB_SHA}" || true
-        git push -q origin master
+        git push -q origin main
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,11 +3,10 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
       - develop
-
     tags:
-      - '*'
+      - "v*.*.*"
   pull_request:
   merge_group:
   issue_comment:

diff --git a/.github/workflows/depends.yml b/.github/workflows/depends.yml