Merge branch 'master' into as/wilkinson

.github/workflows/CompatHelper.yml

@@ -1,18 +1,45 @@
 name: CompatHelper
 on:
   schedule:
-    - cron: '0 0 * * *'  # Everyday at midnight
+    - cron: 0 0 * * *
   workflow_dispatch:
+permissions:
+  contents: write
+  pull-requests: write
 jobs:
   CompatHelper:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
-      - name: Pkg.add("CompatHelper")
-        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
-      - name: CompatHelper.main()
+      - name: Check if Julia is already available in the PATH
+        id: julia_in_path
+        run: which julia
+        continue-on-error: true
+      - name: Install Julia, but only if it is not already available in the PATH
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: '1'
+          arch: ${{ runner.arch }}
+        if: steps.julia_in_path.outcome != 'success'
+      - name: "Add the General registry via Git"
+        run: |
+          import Pkg
+          ENV["JULIA_PKG_SERVER"] = ""
+          Pkg.Registry.add("General")
+        shell: julia --color=yes {0}
+      - name: "Install CompatHelper"
+        run: |
+          import Pkg
+          name = "CompatHelper"
+          uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
+          version = "3"
+          Pkg.add(; name, uuid, version)
+        shell: julia --color=yes {0}
+      - name: "Run CompatHelper"
+        run: |
+          import CompatHelper
+          CompatHelper.main(subdirs=["", "MakieCore", "GLMakie", "WGLMakie", "CairoMakie", "RPRMakie"])
+        shell: julia --color=yes {0}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
-        run: julia -e 'using CompatHelper; CompatHelper.main()'
+          # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

.github/workflows/Docs.yml

@@ -1,16 +1,13 @@
 name: Docs build and deploy
 on:
-  push:
+  pull_request:
     branches:
-      - main
       - master
-      - breaking-release
-    tags: '*'
-  pull_request:
+  push:
+    tags:
+      - '*'
     branches:
-      - main
       - master
-      - breaking-release
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -21,12 +18,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         persist-credentials: false
     # NOTE: Python is necessary for the pre-rendering (minification) step
     - name: Install python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.8'
     - name: Install binary dependencies
@@ -38,6 +35,7 @@ jobs:
       uses: julia-actions/setup-julia@v1
       with:
         version: '1'
+    - uses: julia-actions/cache@v1
     - name: Build and deploy docs
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -46,7 +44,7 @@ jobs:
           DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24'
           julia --color=yes makedocs.jl
     - name: Upload site as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Docs build
         path: ./docs/__site

.github/workflows/ci.yml

@@ -1,27 +1,23 @@
-name: Makie CI
+name: Makie.jl
 on:
   pull_request:
     paths-ignore:
       - 'docs/**'
       - '*.md'
     branches:
       - master
-      - breaking-release
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
+    tags:
+      - '*'
     branches:
       - master
-      - breaking-release
-    tags: '*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  test:
+  makie:
     name: Julia ${{ matrix.version }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -36,16 +32,16 @@ jobs:
           - x64
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/cache@v1
-      - name: Install Julia dependencies
+      - name: Develop and test Makie
         shell: julia --project=monorepo {0}
         run: |
-          using Pkg;
+          using Pkg
           # dev mono repo versions
           pkg"dev . ./MakieCore"
           Pkg.test("Makie"; coverage=true)

.github/workflows/compilation-benchmark.yaml

@@ -6,7 +6,9 @@ on:
       - '*.md'
     branches:
       - master
-      - breaking-release
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 jobs:
   benchmark:
     name: ${{ matrix.package }}
@@ -20,12 +22,13 @@ jobs:
           - WGLMakie
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install xvfb
         run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
       - uses: julia-actions/setup-julia@v1
         with:
           version: '1'
+          include-all-prereleases: true
           arch: x64
       - uses: julia-actions/cache@v1
       - name: Benchmark

.github/workflows/enforce_news.yml

@@ -0,0 +1,14 @@
+name: "Enforce changelog"
+on:
+  pull_request:
+      types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dangoslen/changelog-enforcer@v3
+      with:
+        changeLogPath: 'CHANGELOG.md'
+        skipLabels: 'skip-changelog'