Skip to content

Commit

Permalink
Merge branch 'master' into waterfall
Browse files Browse the repository at this point in the history
  • Loading branch information
jkrumbiegel authored Jan 1, 2024
2 parents fab75ec + 3f6f0f7 commit 6c9f7e5
Show file tree
Hide file tree
Showing 302 changed files with 16,431 additions and 5,358 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/Docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
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
Expand All @@ -36,6 +36,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 }}
Expand All @@ -44,7 +45,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
62 changes: 0 additions & 62 deletions .github/workflows/cairomakie.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Makie CI
name: Makie.jl
on:
pull_request:
paths-ignore:
Expand All @@ -18,7 +18,7 @@ concurrency:
cancel-in-progress: true

jobs:
test:
makie:
name: Julia ${{ matrix.version }}
runs-on: ${{ matrix.os }}
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/compilation-benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
branches:
- master
- sd/beta-20
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
benchmark:
name: ${{ matrix.package }}
Expand All @@ -26,6 +29,7 @@ jobs:
- uses: julia-actions/setup-julia@v1
with:
version: '1'
include-all-prereleases: true
arch: x64
- uses: julia-actions/cache@v1
- name: Benchmark
Expand Down
82 changes: 0 additions & 82 deletions .github/workflows/glmakie.yaml

This file was deleted.

Loading

0 comments on commit 6c9f7e5

Please sign in to comment.