Merge remote-tracking branch 'upstream/master' into cs_safe

dingraha · Sep 11, 2024 · c1444d0 · c1444d0
2 parents d4ac9f4 + b5e9514
commit c1444d0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml
@@ -4,6 +4,22 @@ on:
     types:
       - created
   workflow_dispatch:
+    inputs:
+      lookback:
+        default: "3"
+permissions:
+  actions: read
+  checks: read
+  contents: write
+  deployments: read
+  issues: read
+  discussions: read
+  packages: read
+  pages: read
+  pull-requests: read
+  repository-projects: read
+  security-events: read
+  statuses: read
 jobs:
   TagBot:
     if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
@@ -12,4 +28,6 @@ jobs:
       - uses: JuliaRegistries/TagBot@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          ssh: ${{ secrets.DOCUMENTER_KEY }}
+          # Edit the following line to reflect the actual name of the GitHub Secret containing your private key
+          ssh: ${{ secrets.SSH_KEY }}
+          # ssh: ${{ secrets.NAME_OF_MY_SSH_PRIVATE_KEY_SECRET }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,10 +16,20 @@ jobs:
         julia-version: ['1.6', '1']
         julia-arch: [x64]
         os: [ubuntu-latest, windows-latest, macOS-latest]
+        exclude:
+          # https://discourse.julialang.org/t/running-ci-for-julia-1-6-on-github-macos-runners-seems-to-fail/116577/3
+          # macOS-latest implies arm64, which isn't available for Julia 1.6, so skip that.
+          - os: macOS-latest
+            julia-version: 1.6
+
+        include:
+          # macOS-13 appears to be the last x64 macOS.
+          - os: macOS-13
+            julia-version: 1.6
 
     steps:
       - uses: actions/checkout@v1.0.0
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.julia-version }}
-      - uses: julia-actions/julia-runtest@master
+      - uses: julia-actions/julia-runtest@master
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "CCBlade"
 uuid = "e1828068-15df-11e9-03e4-ef195ea46fa4"
 authors = ["Andrew Ning <aning@byu.edu>"]
-version = "0.2.5"
+version = "0.2.6"
 
 [deps]
 FLOWMath = "6cb5d3fb-0fe8-4cc2-bd89-9fe0b19a99d3"
@@ -10,6 +10,6 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-FLOWMath = "0.3.4"
+FLOWMath = "0.3, 0.4"
 ImplicitAD = "0.3.1"
 julia = "1.6"