Skip to content

Commit ea005fb

Browse files
bors[bot]Yujie-W
andauthored
Merge #57
57: refactor the model to CliMA Land v0.2 r=Yujie-W a=Yujie-W ## Purpose - Add the submodules back in folder packages - Combine the tests into one - Combine the docs Co-authored-by: Yujie Wang <jesiner@gmail.com> Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
2 parents 41f90ba + 58e9b29 commit ea005fb

File tree

326 files changed

+18835
-18461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+18835
-18461
lines changed

.github/workflows/CleanNotebooks.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/CompatHelper.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ jobs:
1414
uses: julia-actions/setup-julia@v1
1515
with:
1616
version: "1"
17+
- name: Use Github Registry
18+
run: julia -e 'using Pkg; Pkg.Registry.rm("General"); Pkg.Registry.add(RegistrySpec(url="https://github.com/JuliaRegistries/General"))'
1719
- name: Install Dependencies
18-
run: julia --project=docs/ -e 'ENV["PYTHON"]=""; using Pkg; Pkg.instantiate(); Pkg.add("CompatHelper");'
20+
run: julia --project -e 'ENV["PYTHON"]=""; using Pkg; Pkg.update();'
21+
- name: Install CompatHelper
22+
run: julia -e 'using Pkg; Pkg.add("CompatHelper");'
1923
- name: Run CompatHelper
2024
env:
2125
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Documentation.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ jobs:
1818
uses: julia-actions/setup-julia@v1
1919
with:
2020
version: "1"
21+
- name: Use Github Registry
22+
run: julia -e 'using Pkg; Pkg.Registry.rm("General"); Pkg.Registry.add(RegistrySpec(url="https://github.com/JuliaRegistries/General"))'
2123
- name: Install Dependencies
22-
run: julia --project=docs/ -e 'ENV["PYTHON"]=""; using Pkg; Pkg.instantiate();'
24+
run: julia --project=docs/ -e 'ENV["PYTHON"]=""; using Pkg; Pkg.update();'
2325
- name: Build and deploy
2426
env:
2527
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Julia-1.6.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Julia-1.6
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- staging
7+
- trying
8+
pull_request:
9+
10+
jobs:
11+
version-test:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Set up Actions
15+
uses: actions/checkout@v1
16+
- name: Set up Julia
17+
uses: julia-actions/setup-julia@v1
18+
with:
19+
version: "1.6"
20+
- name: Use Github Registry
21+
run: julia -e 'using Pkg; Pkg.Registry.rm("General"); Pkg.Registry.add(RegistrySpec(url="https://github.com/JuliaRegistries/General"))'
22+
- name: Install Dependencies
23+
run: julia --project -e 'ENV["PYTHON"]=""; using Pkg; Pkg.update();'
24+
- name: Run Tests
25+
uses: julia-actions/julia-runtest@latest

.github/workflows/JuliaStable.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@ jobs:
2525
uses: julia-actions/setup-julia@v1
2626
with:
2727
version: "1"
28-
- name: Install Dependencies for Linux
29-
if: runner.os == 'Linux'
30-
run: julia --project -e 'ENV["PYTHON"]=""; using Pkg; Pkg.instantiate();'
31-
- name: Install Dependencies for Windows and Mac-OS
32-
if: runner.os != 'Linux'
33-
run: julia --project -e 'using Pkg; Pkg.instantiate();'
28+
- name: Use Github Registry for Linux and Mac-OS
29+
if: runner.os != 'Windows'
30+
run: |
31+
julia -e 'using Pkg; Pkg.Registry.rm("General"); Pkg.Registry.add(RegistrySpec(url="https://github.com/JuliaRegistries/General"))'
32+
julia --project -e 'ENV["PYTHON"]=""; using Pkg; Pkg.update();'
33+
- name: Use Github Registry for Windows
34+
if: runner.os == 'Windows'
35+
run: |
36+
julia -e 'using Pkg; Pkg.Registry.rm(\"General\"); Pkg.Registry.add(RegistrySpec(url=\"https://github.com/JuliaRegistries/General\"))'
37+
julia --project -e 'ENV[\"PYTHON\"]=\"\"; using Pkg; Pkg.update();'
3438
- name: Run Tests
3539
uses: julia-actions/julia-runtest@latest
3640
- name: Process Coverage

.gitignore

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,24 @@
1-
# Temporary
2-
*~
3-
*.DS_Store
4-
*.ipynb_checkpoints/
1+
# Files generated by invoking Julia with --code-coverage
52
*.jl.cov
63
*.jl.*.cov
4+
5+
# Files generated by invoking Julia with --track-allocation
76
*.jl.mem
8-
*.swp
9-
.vscode/*
10-
TAGS
117

12-
# Docs
8+
# System-specific files and directories generated by the BinaryProvider and BinDeps packages
9+
# They contain absolute paths specific to the host computer, and so should not be committed
10+
deps/deps.jl
11+
deps/build.log
12+
deps/downloads/
13+
deps/usr/
14+
deps/src/
15+
16+
# Build artifacts for creating documentation generated by the Documenter package
1317
docs/build/
1418
docs/site/
15-
docs/src/tutorials/
16-
docs/src/generated/
17-
18-
# Deps
19-
Manifest.toml
20-
!docs/src/Manifest.toml
21-
22-
# Data
23-
*.csv
24-
*.dat
25-
*.nc
26-
*.pvtu
27-
*.vtk
28-
*.vtu
2919

30-
# Figs
31-
*.jpeg
32-
*.jpg
33-
*.png
34-
*.svg
35-
!docs/src/assets/*.ico
36-
!docs/src/assets/*.png
37-
!docs/src/assets/*.svg
38-
!pics/*.jpg
39-
!pics/*.png
20+
# File generated by Pkg, the package manager, based on a corresponding Project.toml
21+
# It records a fixed state of all packages used by the project. As such, it should not be
22+
# committed for packages, but should be committed for applications that require a static
23+
# environment.
24+
packages/*/Manifest.toml

0 commit comments

Comments
 (0)