diff --git a/.github/workflows/cairomakie.yaml b/.github/workflows/cairomakie.yaml deleted file mode 100644 index 05646257e03..00000000000 --- a/.github/workflows/cairomakie.yaml +++ /dev/null @@ -1,62 +0,0 @@ -name: CairoMakie CI -on: - pull_request: - paths-ignore: - - 'docs/**' - - '*.md' - branches: - - master - - sd/beta-20 - push: - tags: - - '*' - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - test: - 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 - uses: actions/upload-artifact@v3 - with: - name: ReferenceImages_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.version }} - 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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 578c220fdf8..c462b0c8a0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Makie CI +name: Makie.jl on: pull_request: paths-ignore: @@ -18,7 +18,7 @@ concurrency: cancel-in-progress: true jobs: - test: + makie: name: Julia ${{ matrix.version }} runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/glmakie.yaml b/.github/workflows/glmakie.yaml deleted file mode 100644 index 647212fad29..00000000000 --- a/.github/workflows/glmakie.yaml +++ /dev/null @@ -1,82 +0,0 @@ -name: GLMakie CI -on: - pull_request: - paths-ignore: - - 'docs/**' - - '*.md' - branches: - - master - - sd/beta-20 - push: - tags: - - '*' - branches: - - master - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - test: - 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 - uses: actions/upload-artifact@v3 - with: - name: ReferenceImages_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.version }} - path: | - ./GLMakie/test/recorded_reference_images/ - - name: Save number of missing refimages to file - 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 - uses: actions/upload-artifact@v3 - 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 diff --git a/.github/workflows/reference_tests.yml b/.github/workflows/reference_tests.yml new file mode 100644 index 00000000000..561f6c23122 --- /dev/null +++ b/.github/workflows/reference_tests.yml @@ -0,0 +1,173 @@ +name: Backends +on: + pull_request: + paths-ignore: + - 'docs/**' + - '*.md' + branches: + - master + - sd/beta-20 + 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 + uses: actions/upload-artifact@v3 + with: + name: ReferenceImages_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.version }} + 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 + uses: actions/upload-artifact@v3 + with: + name: ReferenceImages_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.version }} + path: | + ./GLMakie/test/recorded_reference_images/ + - name: Save number of missing refimages to file + 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 + uses: actions/upload-artifact@v3 + 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 + uses: actions/upload-artifact@v3 + with: + name: ReferenceImages_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.version }} + 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 diff --git a/.github/workflows/refimages_status.yaml b/.github/workflows/refimages_status.yaml index 28de7475326..90aadcf56ec 100644 --- a/.github/workflows/refimages_status.yaml +++ b/.github/workflows/refimages_status.yaml @@ -2,7 +2,7 @@ name: Reference Image Status on: workflow_run: - workflows: [GLMakie CI] + workflows: [Backends] types: - completed diff --git a/.github/workflows/wglmakie.yaml b/.github/workflows/wglmakie.yaml deleted file mode 100644 index 6265a58419c..00000000000 --- a/.github/workflows/wglmakie.yaml +++ /dev/null @@ -1,65 +0,0 @@ -name: WGLMakie CI -on: - pull_request: - paths-ignore: - - 'docs/**' - - '*.md' - branches: - - master - - sd/beta-20 - push: - tags: - - '*' - branches: - - master - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - test: - 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 - uses: actions/upload-artifact@v3 - with: - name: ReferenceImages_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.version }} - 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