Merge branch 'master' into sd/shadertoy

.JuliaFormatter.toml

@@ -1,11 +1,11 @@
 always_for_in = true
 always_use_return = true
-import_to_using = true
+import_to_using = false
 margin = 110
 pipe_to_function_call = true
 remove_extra_newlines = true
-short_to_long_function_def = true
-style = "yas"
+short_to_long_function_def = false
+style = "blue"
 whitespace_in_kwargs = false
 whitespace_ops_in_indices = true
 whitespace_typedefs = false

.codecov.yml

@@ -2,3 +2,6 @@ comment: false
 coverage:
   status:
     project: false
+    patch: false
+github_checks:
+    annotations: false

.github/workflows/Docs.yml

@@ -3,13 +3,12 @@ on:
   pull_request:
     branches:
       - master
-      - breaking-0.21
   push:
     tags:
       - '*'
     branches:
       - master
-      - breaking-0.21
+
   workflow_dispatch:
 
 concurrency:
@@ -50,4 +49,4 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: Docs build
-        path: ./docs/__site
+        path: ./docs/build

.github/workflows/ci.yml

@@ -49,6 +49,6 @@ jobs:
           Pkg.test("Makie"; coverage=true)
 
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: lcov.info

.github/workflows/compilation-benchmark.yaml

@@ -10,6 +10,7 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
+
 jobs:
   benchmark:
     name: ${{ matrix.package }}
@@ -37,4 +38,64 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.BENCHMARK_KEY }}
           PR_NUMBER: ${{ github.event.number }}
         run: >
-          DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=./metrics/ttfp/ ./metrics/ttfp/run-benchmark.jl ${{ matrix.package }} 7 ${{ github.event.pull_request.base.ref }}
+          DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=./metrics/ttfp/ ./metrics/ttfp/run-benchmark.jl ${{ matrix.package }} 20 ${{ github.event.pull_request.base.ref }}
+      - name: Upload plots as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.package }}
+          path: ./benchmark_results
+  post-gist:
+    name: Post Benchmark Gist
+    needs: benchmark  # Wait for all benchmark jobs to complete
+    runs-on: ubuntu-20.04
+    permissions:
+      statuses: write       # Permission to post workflow status
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./images
+          merge-multiple: true
+
+      - name: Create Gist with images
+        env:
+          GH_TOKEN: ${{ secrets.BENCHMARK_KEY }}
+        run: |
+          # Create a gist with the three images
+          gist_url=$(gh gist create ./images/CairoMakie.svg ./images/GLMakie.svg ./images/WGLMakie.svg | grep -Eo 'https://gist.github.com[/a-zA-Z0-9]+')
+          echo "Gist created: $gist_url"
+
+          # Save the gist URL for later steps
+          echo "GIST_URL=$gist_url" >> $GITHUB_ENV
+          echo "GIST_URL_USERCONTENT=$(echo $gist_url | sed 's|github|githubusercontent|')" >> $GITHUB_ENV
+
+      - name: Post workflow status with gist link
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gist_url=$GIST_URL
+          gh api \
+            --method POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            /repos/${{ github.repository }}/statuses/${{ github.event.pull_request.head.sha }} \
+            -f "state=success" \
+            -f "context=Benchmark Results" \
+            -f "description=Plots are available under Details" \
+            -f "target_url=$gist_url"
+      - name: Post comment
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          github-token: ${{ secrets.BENCHMARK_KEY }}
+          comment-tag: benchmark # this allows to update the same post with new data
+          message: |
+            # Benchmark Results
+
+            SHA: [${{ github.event.pull_request.head.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.event.pull_request.head.sha }})
+
+            > [!WARNING]
+            > These results are subject to substantial noise because GitHub's CI runs on shared machines that are not ideally suited for benchmarking.
+
+            ![GLMakie](${{ env.GIST_URL_USERCONTENT }}/raw/GLMakie.svg)
+            ![CairoMakie](${{ env.GIST_URL_USERCONTENT }}/raw/CairoMakie.svg)
+            ![WGLMakie](${{ env.GIST_URL_USERCONTENT }}/raw/WGLMakie.svg)

.github/workflows/reference_tests.yml

@@ -60,7 +60,7 @@ jobs:
         if: ${{ env.TESTS_SUCCESSFUL != 'true' }}
         run: exit 1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: lcov.info
 
@@ -112,7 +112,7 @@ jobs:
         if: ${{ env.TESTS_SUCCESSFUL != 'true' }}
         run: exit 1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: lcov.info
 
@@ -156,11 +156,16 @@ jobs:
         with:
           name: ReferenceImages_WGLMakie_${{ matrix.version }}
           path: ./WGLMakie/test/reference_images/
+      - name: Upload test Electron logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: Electron_Logs_WGLMakie_${{ matrix.version }}
+          path: ./WGLMakie/test/electron.log
       - name: Fail after artifacts if tests failed
         if: ${{ env.TESTS_SUCCESSFUL != 'true' }}
         run: exit 1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: lcov.info
 

.github/workflows/relocatability.yml

@@ -17,8 +17,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  glmakie:
-    name: GLMakie relocatability
+  makie-relocatability:
+    name: Relocatability ${{ matrix.backend }}
     env:
       MODERNGL_DEBUGGING: "true" # turn on errors when running OpenGL tests
     runs-on: ${{ matrix.os }}
@@ -31,6 +31,10 @@ jobs:
           - ubuntu-20.04
         arch:
           - x64
+        backend:
+          - GLMakie
+          - WGLMakie
+          - CairoMakie
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -39,7 +43,13 @@ jobs:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/cache@v2
-      - 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 xsettingsd x11-xserver-utils
+      - name: Install dependencies for GPU backends
+        if: matrix.backend != 'CairoMakie'
+        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 xsettingsd x11-xserver-utils
       - name: Relocatability test
-        run: >
-          DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia ./relocatability.jl
+        run: |
+          if [ "${{ matrix.backend }}" != "CairoMakie" ]; then
+            DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes ./relocatability.jl ${{ matrix.backend }}
+          else
+            julia --color=yes ./relocatability.jl ${{ matrix.backend }}
+          fi

.github/workflows/rprmakie.yaml

@@ -59,6 +59,6 @@ jobs:
         if: ${{ env.TESTS_SUCCESSFUL != 'true' }}
         run: exit 1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: lcov.info

.gitignore

@@ -25,3 +25,4 @@ docs/documentation/news.md
 metrics/ttfp/current-pr-project/
 metrics/ttfp/benchmark-projects/*
 *benchmark.json
+WGLMakie/test/electron.log