Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into swe_wetdry
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickersing committed Jan 31, 2024
2 parents 9ab4208 + 6bb65dd commit fee2c88
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 19 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/FormatCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: format-check

on:
push:
branches:
- 'main'
tags: '*'
pull_request:

jobs:
check-format:
runs-on: ${{ matrix.os }}
strategy:
matrix:
julia-version: [1]
julia-arch: [x86]
os: [ubuntu-latest]
steps:
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.julia-version }}

- uses: actions/checkout@v4
- name: Install JuliaFormatter and format
# This will use the latest version by default but you can set the version like so:
#
# julia -e 'using Pkg; Pkg.add(PackageSpec(name = "JuliaFormatter", version = "0.13.0"))'
run: |
julia -e 'using Pkg; Pkg.add(PackageSpec(name = "JuliaFormatter"))'
julia -e 'using JuliaFormatter; format(".")'
- name: Format check
run: |
julia -e '
out = Cmd(`git diff --name-only`) |> read |> String
if out == ""
exit(0)
else
@error "Some files have not been formatted !!!"
write(stdout, out)
exit(1)
end'
13 changes: 13 additions & 0 deletions .github/workflows/SpellCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Spell Check

on: [pull_request, workflow_dispatch]

jobs:
typos-check:
name: Spell Check with Typos
runs-on: ubuntu-latest
steps:
- name: Checkout Actions Repository
uses: actions/checkout@v4
- name: Check spelling
uses: crate-ci/[email protected]
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

# needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

jobs:
test:
if: "!contains(github.event.head_commit.message, 'skip ci')"
Expand Down Expand Up @@ -67,7 +72,7 @@ jobs:
- uses: codecov/codecov-action@v3
with:
files: lcov.info
- uses: coverallsapp/github-action@master
- uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./lcov.info
34 changes: 16 additions & 18 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
using TrixiShallowWater
using Documenter

DocMeta.setdocmeta!(TrixiShallowWater, :DocTestSetup, :(using TrixiShallowWater); recursive=true)
DocMeta.setdocmeta!(TrixiShallowWater, :DocTestSetup, :(using TrixiShallowWater);
recursive = true)

makedocs(;
modules=[TrixiShallowWater],
authors="Andrew R. Winters <[email protected]>, Michael Schlottke-Lakemper <[email protected]>",
repo="https://github.com/trixi-framework/TrixiShallowWater.jl/blob/{commit}{path}#{line}",
sitename="TrixiShallowWater.jl",
format=Documenter.HTML(;
prettyurls=get(ENV, "CI", "false") == "true",
canonical="https://trixi-framework.github.io/TrixiShallowWater.jl",
edit_link="main",
assets=String[],
),
pages=[
"Home" => "index.md",
],
)
modules = [TrixiShallowWater],
authors = "Andrew R. Winters <[email protected]>, Michael Schlottke-Lakemper <[email protected]>",
repo = "https://github.com/trixi-framework/TrixiShallowWater.jl/blob/{commit}{path}#{line}",
sitename = "TrixiShallowWater.jl",
format = Documenter.HTML(;
prettyurls = get(ENV, "CI", "false") == "true",
canonical = "https://trixi-framework.github.io/TrixiShallowWater.jl",
edit_link = "main",
assets = String[],),
pages = [
"Home" => "index.md",
],)

deploydocs(;
repo="github.com/trixi-framework/TrixiShallowWater.jl",
devbranch="main",
)
repo = "github.com/trixi-framework/TrixiShallowWater.jl",
devbranch = "main",)

0 comments on commit fee2c88

Please sign in to comment.