Skip to content

Commit

Permalink
Merge pull request #2393 from CliMA/gb/clean_gha
Browse files Browse the repository at this point in the history
Clean up Github Actions/buildkite
  • Loading branch information
Sbozzolo authored Dec 22, 2023
2 parents 13b638f + 570d47d commit fa5950d
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 75 deletions.
15 changes: 0 additions & 15 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ steps:
- "julia --project -e 'using Pkg; Pkg.precompile()'"
- "julia --project -e 'using Pkg; Pkg.status()'"

- echo "--- Instantiate test"
- "julia --project=test -e 'using Pkg; Pkg.develop(path = \".\")'"
- "julia --project=test -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=test -e 'using Pkg; Pkg.precompile()'"
- "julia --project=test -e 'using Pkg; Pkg.status()'"

- echo "--- Instantiate examples"
- "julia --project=examples -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=examples -e 'using Pkg; Pkg.precompile()'"
Expand Down Expand Up @@ -512,15 +506,6 @@ steps:
--config_file $CONFIG_PATH/test_io.yml
artifact_paths: "test_io/*"

- label: ":computer: Use test env with latest deps"
command: >
julia --color=yes --project=test examples/hybrid/driver.jl
--config_file $CONFIG_PATH/test_env.yml
artifact_paths: "test_env/*"
soft_fail: true
agents:
slurm_mem: 20GB

- label: ":computer: MPI io test"
command: >
srun julia --color=yes --project=examples examples/hybrid/driver.jl
Expand Down
9 changes: 1 addition & 8 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# Configuration file for codecov. Used to remove some GitHub boxes
comment: false
coverage:
status:
project:
default:
target: auto
# this allows a 10% drop from the previous base commit coverage
threshold: 10%

github_checks:
annotations: false
40 changes: 0 additions & 40 deletions .github/workflows/CodeCov.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/DocCleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout gh-pages branch
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: gh-pages

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Invalidations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
- uses: julia-actions/setup-julia@v1
with:
version: '1'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-invalidations@v1
id: invs_pr

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.repository.default_branch }}
- uses: julia-actions/julia-buildpkg@v1
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
pull_request:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: ci ${{ matrix.version }} - ${{ matrix.os }}
Expand All @@ -14,13 +18,14 @@ jobs:
matrix:
version:
- '1.9'
- '~1.10.0-rc1'
os:
- ubuntu-latest
- macOS-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
Expand All @@ -41,3 +46,4 @@ jobs:
- uses: codecov/codecov-action@v1
with:
file: lcov.info
token: ${{secrets.CODECOV_TOKEN}}
6 changes: 5 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ on:
pull_request:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
docbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: 1.9
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/julia_formatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ on:
pull_request:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
format:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4

- uses: dorny/[email protected]
id: filter
Expand Down
57 changes: 57 additions & 0 deletions .github/workflows/lookahead.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: lookahead

# This action sets up a couple of tests for newer versions of julia and for
# dependencies more recent than the one in examples so that one can see if there
# are upcoming problems.

on:
push:
tags: '*'
pull_request:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: ci ${{ matrix.version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
version:
- '1.9'
- '~1.10.0-rc1'
os:
- ubuntu-latest
arch:
- x64
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- name: Instantiate test env
run: |
julia --project=test -e "using Pkg; Pkg.instantiate(); Pkg.develop(path=\".\")"
- name: Run test_env.yml
continue-on-error: true
run: |
julia --project=test examples/hybrid/driver.jl --config_file config/model_configs/test_env.yml
- name: Run tests
run: |
julia --project=test test/runtests.jl
4 changes: 2 additions & 2 deletions config/model_configs/test_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ precip_model: "0M"
dt: "1secs"
t_end: "10secs"
dt_save_to_sol: "Inf"
z_elem: 25
h_elem: 12
z_elem: 20
h_elem: 8
dt_rad: "5secs"

0 comments on commit fa5950d

Please sign in to comment.