Merge branch 'main' into ml/grads

Author: abhro

.github/workflows/ci.yml

@@ -1,20 +1,18 @@
 name: CI
 on:
   push:
-    branches:
-      - main
+    branches: [main]
     tags: '*'
   pull_request:
-    branches:
-      - main
+    branches: [main]
 concurrency:
   # Skip intermediate builds: always.
   # Cancel intermediate builds: only if it is a pull request build.
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 jobs:
   test:
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -27,14 +25,11 @@ jobs:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
-        arch:
-          - default
     steps:
       - uses: actions/checkout@v7
       - uses: julia-actions/setup-julia@v3
         with:
           version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
       - uses: julia-actions/cache@v3
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
@@ -51,25 +46,11 @@ jobs:
       - uses: julia-actions/setup-julia@v3
         with:
           version: '1'
+      - uses: julia-actions/cache@v3
       - uses: julia-actions/julia-buildpkg@v1
-      - run: julia -e 'using Pkg; Pkg.add("Aqua")'
-      - run: julia --project=@. -e 'using Aqua, PSFModels; Aqua.test_all(PSFModels, ambiguities=false)'
-  docs:
-    name: Documentation
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-      - uses: julia-actions/setup-julia@v3
-        with:
-          version: '1'
-      - run: |
-          julia --project=docs -e '
-            using Pkg
-            Pkg.develop(PackageSpec(path=pwd()))
-            Pkg.instantiate()'
-      - run: julia --project=docs docs/make.jl
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
-          GKSwstype: "100" # fix GKS socket error for plots made in @example blocks
-          DATADEPS_ALWAYS_ACCEPT: true
+      - name: Install Aqua
+        shell: julia --color=yes {0}
+        run: using Pkg; Pkg.add("Aqua")
+      - name: Run Aqua tests
+        shell: julia --project=@. --color=yes {0}
+        run: 'using Aqua, PSFModels; Aqua.test_all(PSFModels, ambiguities=false)'

.github/workflows/docs.yml

@@ -0,0 +1,32 @@
+name: Documentation
+on:
+  push:
+    branches: [main]
+    tags: '*'
+  pull_request:
+    branches: [main]
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+jobs:
+  docs:
+    name: Documentation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: julia-actions/setup-julia@v3
+        with:
+          version: '1'
+      - uses: julia-actions/cache@v3
+      - name: Set up environment
+        shell: julia --color=yes --project=docs {0}
+        run: using Pkg; Pkg.instantiate()
+      - name: Build and deploy documentation
+        run: julia --color=yes --project=docs docs/make.jl
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
+          GKSwstype: "100" # fix GKS socket error for plots made in @example blocks
+          DATADEPS_ALWAYS_ACCEPT: true

.github/workflows/preview-cleanup.yml

@@ -13,16 +13,18 @@ jobs:
         with:
           ref: gh-pages
 
-      - name: Delete preview and history
+      - name: Configure Git
         run: |
             git config user.name "Documenter.jl"
             git config user.email "documenter@juliadocs.github.io"
+
+      - name: Delete preview and history
+        run: |
             git rm -rf "previews/PR$PRNUM"
             git commit -m "delete preview"
             git branch gh-pages-new $(echo "delete history" | git commit-tree HEAD^{tree})
         env:
             PRNUM: ${{ github.event.number }}
 
       - name: Push changes
-        run: |
-            git push --force origin gh-pages-new:gh-pages
+        run: git push --force origin gh-pages-new:gh-pages