Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature #2297 gha #2299

Merged
merged 4 commits into from
Oct 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/jobs/get_branch_name.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ fi

branch_name=${branch_name#"refs/heads/"}

echo ::set-output name=branch_name::$branch_name
echo "branch_name=${branch_name}" >> $GITHUB_OUTPUT
echo branch_name: $branch_name
18 changes: 9 additions & 9 deletions .github/jobs/set_job_controls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ if [ "$run_unit_tests" == "true" ]; then

fi

echo ::set-output name=run_compile::$run_compile
echo ::set-output name=run_push::$run_push
echo ::set-output name=run_unit_tests::$run_unit_tests
echo ::set-output name=run_diff::$run_diff
echo ::set-output name=run_update_truth::$run_update_truth
echo ::set-output name=met_base_repo::$met_base_repo
echo ::set-output name=met_base_tag::$met_base_tag
echo ::set-output name=input_data_version::$input_data_version
echo ::set-output name=truth_data_version::$truth_data_version
echo "run_compile=${run_compile}" >> $GITHUB_OUTPUT
echo "run_push=${run_push}" >> $GITHUB_OUTPUT
echo "run_unit_tests=${run_unit_tests}" >> $GITHUB_OUTPUT
echo "run_diff=${run_diff}" >> $GITHUB_OUTPUT
echo "run_update_truth=${run_update_truth}" >> $GITHUB_OUTPUT
echo "met_base_repo=${met_base_repo}" >> $GITHUB_OUTPUT
echo "met_base_tag=${met_base_tag}" >> $GITHUB_OUTPUT
echo "input_data_version=${input_data_version}" >> $GITHUB_OUTPUT
echo "truth_data_version=${truth_data_version}" >> $GITHUB_OUTPUT

echo run_compile: $run_compile
echo run_push: $run_push
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_docker_and_trigger_metplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Get branch name
id: get_branch_name
run: echo ::set-output name=branch_name::${GITHUB_REF#"refs/heads/"}
run: echo "branch_name::${GITHUB_REF#\"refs/heads/\"}" >> $GITHUB_OUTPUT

- name: Build Docker Image
run: .github/jobs/build_docker_image.sh
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ on:
- met/docs/**
pull_request:
types: [opened, reopened, synchronize]
workflow_dispatch:

jobs:
documentation:
name: Build Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.6'
- name: Install dependencies
Expand All @@ -27,12 +28,12 @@ jobs:
sphinx-gallery Pillow sphinx_rtd_theme sphinx-panels
- name: Build docs
run: ./.github/jobs/build_documentation.sh
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: always()
with:
name: documentation
path: artifact/documentation
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: documentation_warnings.log
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set job controls
id: job_status
run: .github/jobs/set_job_controls.sh
Expand All @@ -66,7 +66,7 @@ jobs:
needs: job_control
if: ${{ needs.job_control.outputs.run_compile == 'true' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Create directories to store output
run: mkdir -p ${RUNNER_WORKSPACE}/logs
Expand All @@ -92,7 +92,7 @@ jobs:

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
- 'pb2nc madis2nc pcp_combine'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Run Unit Tests in Docker
run: .github/jobs/run_unit_docker.sh
Expand All @@ -136,14 +136,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: unit_1a
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -161,7 +161,7 @@ jobs:
- 'met_test_scripts mode_multivar mode_graphics mtd regrid airnow gsi_tools netcdf modis series_analysis gen_ens_prod wwmca_regrid gen_vx_mask grid_weight interp_shape grid_diag grib_tables lidar2nc shift_data_plane trmm2nc aeronet wwmca_plot ioda2nc gaussian'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Run Unit Tests in Docker
run: .github/jobs/run_unit_docker.sh
Expand All @@ -171,14 +171,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: unit_1b
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -197,7 +197,7 @@ jobs:
- 'ref_config_lead_36'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Run Unit Tests in Docker
run: .github/jobs/run_unit_docker.sh
Expand All @@ -207,14 +207,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: unit_rc_leads
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -231,10 +231,10 @@ jobs:
- 'ref_config'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Download ref_config_leads output from artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: unit_rc_leads
path: ${{ runner.workspace }}/output
Expand All @@ -247,14 +247,14 @@ jobs:
INPUT_DATA_VERSION: 'none'

- name: Upload output as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: unit_rc
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -274,10 +274,10 @@ jobs:
- 'ensemble_stat stat_analysis_es'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Download 1a output from artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: unit_1a
path: ${{ runner.workspace }}/output
Expand All @@ -290,14 +290,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: unit_2a
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -317,10 +317,10 @@ jobs:
- 'python point2grid plot_data_plane mode mode_analysis perc_thresh hira plot_point_obs quality_filter obs_summary duplicate_flag'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Download 1a output from artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: unit_1a
path: ${{ runner.workspace }}/output
Expand All @@ -333,14 +333,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: unit_2b
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -353,14 +353,14 @@ jobs:
if: ${{ needs.job_control.outputs.run_diff == 'true' }}
steps:
- name: Download data from previous jobs
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3

- name: Copy test output into single directory
run: |
mkdir ${RUNNER_WORKSPACE}/output
cp -r unit_*/* ${RUNNER_WORKSPACE}/output/

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Run Diff Tests in Docker
run: .github/jobs/run_diff_docker.sh
Expand All @@ -371,15 +371,15 @@ jobs:

- name: Upload diff files as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: diff
path: ${{ runner.workspace }}/diff
if-no-files-found: ignore

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -391,10 +391,10 @@ jobs:
needs: [job_control, unit_1b, unit_2a, unit_2b, unit_rc]
if: ${{ needs.job_control.outputs.run_update_truth == 'true' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Download data from previous jobs
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3

- name: Copy test output into single directory
run: |
Expand Down
1 change: 0 additions & 1 deletion docs/Users_Guide/grid-stat.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Scientific and statistical aspects of the Grid-Stat tool are briefly described i
Scientific and statistical aspects
==================================


Statistical measures
--------------------

Expand Down