Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonDanisch committed Dec 21, 2023
2 parents 37f3323 + f14c57d commit cca2e5b
Show file tree
Hide file tree
Showing 40 changed files with 667 additions and 356 deletions.
4 changes: 2 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 @@ -45,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
82 changes: 0 additions & 82 deletions .github/workflows/glmakie.yaml

This file was deleted.

177 changes: 177 additions & 0 deletions .github/workflows/reference_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
name: Backends
on:
pull_request:
paths-ignore:
- 'docs/**'
- '*.md'
branches:
- master
push:
tags:
- '*'
branches:
- master

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
cairomakie:
name: CairoMakie Julia ${{ matrix.version }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.6'
- '1' # automatically expands to the latest stable 1.x release of Julia
os:
- ubuntu-20.04
arch:
- x64
steps:
- name: Checkout
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
shell: julia --project=monorepo {0}
run: |
using Pkg;
# dev mono repo versions
pkg"dev . ./MakieCore ./CairoMakie ./ReferenceTests"
- name: Run the tests
continue-on-error: true
run: >
julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("CairoMakie", coverage=true)'
&& echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
- name: Upload test Artifacts
if: matrix.version == '1'
uses: actions/upload-artifact@v4
with:
name: ReferenceImages_CairoMakie
path: ./CairoMakie/test/recorded_reference_images/
- 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@v3
with:
file: lcov.info

glmakie:
name: GLMakie Julia ${{ matrix.version }}
env:
MODERNGL_DEBUGGING: "true" # turn on errors when running OpenGL tests
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.6'
- '1' # automatically expands to the latest stable 1.x release of Julia
os:
- ubuntu-20.04
arch:
- x64
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v1
- 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 Julia dependencies
shell: julia --project=monorepo {0}
run: |
using Pkg;
# dev mono repo versions
pkg"dev . ./MakieCore ./GLMakie ./ReferenceTests"
- name: Run the tests
id: referencetests
continue-on-error: true
run: >
DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("GLMakie", coverage=true)'
&& echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
- name: Upload test Artifacts
if: matrix.version == '1'
uses: actions/upload-artifact@v4
with:
name: ReferenceImages_GLMakie
path: |
./GLMakie/test/recorded_reference_images/
- name: Save number of missing refimages to file
if: matrix.version == '1'
env:
N_MISSING: ${{ steps.referencetests.outputs.n_missing_refimages }}
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
run: |
mkdir -p ./n_missing
echo $N_MISSING > ./n_missing/n_missing_refimages
echo $COMMIT_SHA >> ./n_missing/n_missing_refimages
- name: Upload artifact with number of missing refimages
if: matrix.version == '1'
uses: actions/upload-artifact@v4
with:
name: n_missing_refimages
path: n_missing/
- 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@v3
with:
file: lcov.info

wglmakie:
name: WGLMakie Julia ${{ matrix.version }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.6'
- '1' # automatically expands to the latest stable 1.x release of Julia
os:
- ubuntu-20.04
arch:
- x64
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v1
- 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
- name: Install Julia dependencies
shell: julia --project=monorepo {0}
run: |
using Pkg;
# dev mono repo versions
pkg"dev . ./MakieCore ./WGLMakie ./ReferenceTests"
- name: Run the tests
continue-on-error: true
run: >
DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("WGLMakie", coverage=true)'
&& echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
- name: Upload test Artifacts
if: matrix.version == '1'
uses: actions/upload-artifact@v4
with:
name: ReferenceImages_WGLMakie
path: ./WGLMakie/test/recorded_reference_images/
- 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@v3
with:
file: lcov.info
2 changes: 1 addition & 1 deletion .github/workflows/refimages_status.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Reference Image Status

on:
workflow_run:
workflows: [GLMakie CI]
workflows: [Backends]
types:
- completed

Expand Down
Loading

0 comments on commit cca2e5b

Please sign in to comment.