From eb5f8c49b8f47e4353a4e130fed4f64ecadee6e8 Mon Sep 17 00:00:00 2001 From: Cmurilochem Date: Fri, 18 Oct 2024 11:22:41 +0200 Subject: [PATCH] Update workflow with Test on main and Test on PRs --- .github/workflows/CI.yml | 74 ------------------------------ .github/workflows/ReusableTest.yml | 30 +++++++++++- README.md | 13 +++--- 3 files changed, 36 insertions(+), 81 deletions(-) delete mode 100644 .github/workflows/CI.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml deleted file mode 100644 index e390c0f2..00000000 --- a/.github/workflows/CI.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: CI -on: - push: - branches: - - main - tags: "*" - pull_request: -concurrency: - # Skip intermediate builds: always. - # Cancel intermediate builds: only if it is a pull request build. - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} -jobs: - test: - name: GalerkinToolkit / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - version: - - "1.10" - os: - - ubuntu-latest - arch: - - x64 - steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 - with: - version: ${{ matrix.version }} - arch: ${{ matrix.arch }} - - uses: julia-actions/cache@v1 - - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-runtest@v1 - with: - prefix: xvfb-run -s '-screen 0 1024x768x24' - - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v2 - with: - files: lcov.info - examples: - name: GalerkinToolkitExamples / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - version: - - "1.10" - os: - - ubuntu-latest - arch: - - x64 - steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 - with: - version: ${{ matrix.version }} - arch: ${{ matrix.arch }} - - uses: julia-actions/cache@v1 - - uses: julia-actions/julia-buildpkg@v1 - - run: | - julia --project=GalerkinToolkitExamples -e ' - using Pkg - Pkg.develop(path=".") - Pkg.test("GalerkinToolkitExamples")' - - all_tests: - name: All Tests and Examples - runs-on: ubuntu-latest - needs: [test, examples] - steps: - - name: All test jobs have been successful - run: | - echo "All test jobs have been successful" diff --git a/.github/workflows/ReusableTest.yml b/.github/workflows/ReusableTest.yml index 4e8d93e1..adfe43cb 100644 --- a/.github/workflows/ReusableTest.yml +++ b/.github/workflows/ReusableTest.yml @@ -29,7 +29,7 @@ on: jobs: test: - name: Julia ${{ inputs.version }} - ${{ inputs.os }} - ${{ inputs.arch }} - ${{ github.event_name }} + name: GalerkinToolkit / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} runs-on: ${{ inputs.os }} continue-on-error: ${{ inputs.allow_failure }} @@ -52,3 +52,31 @@ jobs: with: file: lcov.info token: ${{ secrets.codecov_token }} + examples: + name: GalerkinToolkitExamples / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + runs-on: ${{ matrix.os }} + continue-on-error: ${{ inputs.allow_failure }} + + steps: + - uses: actions/checkout@v2 + - uses: julia-actions/setup-julia@v1 + with: + version: ${{ matrix.version }} + arch: ${{ matrix.arch }} + - uses: julia-actions/cache@v1 + - uses: julia-actions/julia-buildpkg@v1 + - run: | + julia --project=GalerkinToolkitExamples -e ' + using Pkg + Pkg.develop(path=".") + Pkg.test("GalerkinToolkitExamples")' + + all_tests: + name: All Tests and Examples + runs-on: ${{ matrix.os }} + needs: [test, examples] + + steps: + - name: All test jobs have been successful + run: | + echo "All test jobs have been successful" diff --git a/README.md b/README.md index 2ce196a6..7d7cbd91 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # GalerkinToolkit -[![Stable Documentation](https://img.shields.io/badge/docs-stable-blue.svg)](https://GalerkinToolkit.github.io/GalerkinToolkit.jl/stable/) -[![Dev Documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://GalerkinToolkit.github.io/GalerkinToolkit.jl/dev/) -[![Build Status](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/CI.yml/badge.svg?branch=main)](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/CI.yml?query=branch%3Amain) -[![Test workflow status](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/Test.yml/badge.svg?branch=main)](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/Test.yml?query=branch%3Amain) -[![Lint workflow Status](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/Lint.yml/badge.svg?branch=main)](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/Lint.yml?query=branch%3Amain) -[![Docs workflow Status](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/Docs.yml/badge.svg?branch=main)](https://github.com/GalerkinToolkit/GalerkinToolkit.jl/actions/workflows/Docs.yml?query=branch%3Amain) +[![Stable Documentation](https://img.shields.io/badge/docs-stable-blue.svg)](https://GalerkinToolKit.github.io/GalerkinToolKit.jl/stable) +[![In development documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://GalerkinToolKit.github.io/GalerkinToolKit.jl/dev) +[![Build Status](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/workflows/Test/badge.svg)](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/actions) +[![Test workflow status](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/actions/workflows/Test.yml/badge.svg?branch=main)](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/actions/workflows/Test.yml?query=branch%3Amain) +[![Lint workflow Status](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/actions/workflows/Lint.yml/badge.svg?branch=main)](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/actions/workflows/Lint.yml?query=branch%3Amain) +[![Docs workflow Status](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/actions/workflows/Docs.yml/badge.svg?branch=main)](https://github.com/GalerkinToolKit/GalerkinToolKit.jl/actions/workflows/Docs.yml?query=branch%3Amain) + [![Coverage](https://codecov.io/gh/GalerkinToolkit/GalerkinToolkit.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/GalerkinToolkit/GalerkinToolkit.jl) [![DOI](https://zenodo.org/badge/497260571.svg)](https://doi.org/10.5281/zenodo.13938389)