Skip to content

Commit

Permalink
Merge #256
Browse files Browse the repository at this point in the history
256: move climacorevtk to lib/ subdir, update CI r=jakebolewski a=jakebolewski



Co-authored-by: Jake Bolewski <jakebolewski@gmail.com>
  • Loading branch information
bors[bot] and jakebolewski authored Oct 15, 2021
2 parents b8000b1 + b905853 commit 1e674e8
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 23 deletions.
24 changes: 6 additions & 18 deletions .github/workflows/ClimaCoreVTK.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,21 @@ on:
pull_request:
paths:
- ".github/workflows/ClimaCoreVTK.yml"
- "ClimaCoreVTK/src/**"
- "ClimaCoreVTK/test/**"
- "lib/ClimaCoreVTK/**"
push:
branches:
- staging
- trying
jobs:
test-os:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
lib-climacorevtk:
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
fail-fast: true
matrix:
version:
- '1.6'
os:
- ubuntu-latest
arch:
- x64
steps:
- name: Checkout
uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
version: '1.6'
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
Expand All @@ -45,7 +33,7 @@ jobs:
run: |
using Pkg;
# dev mono repo versions
pkg"dev . ClimaCoreVTK"
pkg"dev . lib/ClimaCoreVTK"
- name: Run the tests
run: |
julia --project=monorepo -e 'using Pkg; Pkg.test("ClimaCoreVTK")'
julia --project=monorepo -e 'using Pkg; Pkg.test("ClimaCoreVTK")'
2 changes: 1 addition & 1 deletion .github/workflows/Linux-UnitTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'test/**'
- 'Project.toml'
- 'Manifest.toml'

- '!lib/**'
jobs:
test:
runs-on: ubuntu-latest
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/OS-UnitTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
- 'Project.toml'
- 'Manifest.toml'
- name: Set up Julia
uses: julia-actions/setup-julia@latest
if: steps.filter.outputs.run_test == 'true'
Expand Down
1 change: 1 addition & 0 deletions bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ status = [
"test-os (ubuntu-latest)",
"test-os (windows-latest)",
"test-os (macos-latest)",
"lib-climacorevtk",
"buildkite/climacore-ci",
"format",
"docbuild"
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions ClimaCoreVTK/README.md → lib/ClimaCoreVTK/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ VTK output for ClimaCore fields for visualization with [Paraview](https://www.pa

Activate the Pkg repl mode and dev the ClimaCoreVTK subpackge:

(ClimaCore) pkg> dev ClimaCoreVTK
(ClimaCore) pkg> dev lib/ClimaCoreVTK

You can now use ClimaCoreVTK in your ClimaCore pkg environment:

Expand All @@ -18,10 +18,10 @@ You can now use ClimaCoreVTK in your ClimaCore pkg environment:

### Development of the `ClimaCoreVTK` subpackage

cd ClimaCore/ClimaCoreVTK
cd ClimaCore/lib/ClimaCoreVTK

# Add ClimaCore to subpackage environment
julia --project -e 'using Pkg; Pkg.develop("../")
julia --project -e 'using Pkg; Pkg.develop("../../")

# Instantiate ClimaCoreVTK project environment
julia --project -e 'using Pkg; Pkg.instantiate()'
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions lib/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Packages that extend ClimaCore functionality

* [ClimaCoreVTK](https://github.com/CliMA/ClimaCore.jl/tree/main/lib/ClimaCoreVTK): ClimaCore VTK IO

0 comments on commit 1e674e8

Please sign in to comment.