Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature_2486_proj
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnHalleyGotway committed Jan 11, 2024
2 parents 2d745c8 + ce97b05 commit 6ce4634
Show file tree
Hide file tree
Showing 54 changed files with 2,792 additions and 2,695 deletions.
1 change: 1 addition & 0 deletions .github/jobs/build_docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ time_command docker build -t ${DOCKERHUB_TAG} \
--build-arg SOURCE_BRANCH \
--build-arg MET_BASE_REPO \
--build-arg MET_BASE_TAG \
--build-arg MET_CONFIG_OPTS \
-f $DOCKERFILE_PATH ${GITHUB_WORKSPACE}
if [ $? != 0 ]; then
cat ${GITHUB_WORKSPACE}/docker_build.log
Expand Down
84 changes: 84 additions & 0 deletions .github/workflows/compilation_options.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: Compilation Options

# Test matrix of MET configuration/compilation options

on:

# Note that scheduled cron events are run on the default branch.
# Enable this schedule when main_v12.0 becomes the default branch.

# schedule:
# - cron: '0 7 * * 0''

push:

tags:
- '**'

workflow_dispatch:

env:
DOCKERHUB_REPO: dtcenter/met-dev

jobs:

job_control:
name: Determine which jobs to run
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set job controls
id: job_status
run: .github/jobs/set_job_controls.sh
env:
commit_msg: ${{ github.event.head_commit.message }}
force_tests: ${{ github.event.inputs.force_tests }}

outputs:
met_base_repo: ${{ steps.job_status.outputs.met_base_repo }}
met_base_tag: ${{ steps.job_status.outputs.met_base_tag }}
branch_name: ${{ steps.job_status.outputs.branch_name }}

compile:
name: Config Opts
runs-on: ubuntu-latest
needs: job_control
strategy:
matrix:
config_opts:
- ''
- '--enable-all'
- '--enable-grib2'
- '--enable-python'
- '--enable-ugrid'
- '--enable-lidar2nc'
- '--enable-mode_graphics'
- '--enable-modis'
fail-fast: false
steps:
- uses: actions/checkout@v3

- name: Create directories to store output
run: mkdir -p ${RUNNER_WORKSPACE}/logs

- name: Compile MET in Docker
run: .github/jobs/build_docker_image.sh
env:
SOURCE_BRANCH: ${{ needs.job_control.outputs.branch_name }}
MET_BASE_REPO: ${{ needs.job_control.outputs.met_base_repo }}
MET_BASE_TAG: ${{ needs.job_control.outputs.met_base_tag }}
MET_CONFIG_OPTS: ${{ matrix.config_opts }}

- name: Copy all build log files into logs directory
if: always()
run: cp ${GITHUB_WORKSPACE}/*.log ${RUNNER_WORKSPACE}/logs/

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

1 change: 1 addition & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ jobs:
SOURCE_BRANCH: ${{ needs.job_control.outputs.branch_name }}
MET_BASE_REPO: ${{ needs.job_control.outputs.met_base_repo }}
MET_BASE_TAG: ${{ needs.job_control.outputs.met_base_tag }}
MET_CONFIG_OPTS: '--enable-all'

- name: Copy all build log files into logs directory
if: always()
Expand Down
6 changes: 3 additions & 3 deletions config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/* "build gis_utils" */
#undef ENABLE_GIS_UTILS

/* "build GRIB2 utilities" */
/* "build GRIB2 support" */
#undef ENABLE_GRIB2

/* "build grid_stat" */
Expand Down Expand Up @@ -66,7 +66,7 @@
/* "build point_stat" */
#undef ENABLE_POINT_STAT

/* "build python embedding" */
/* "build Python embedding support" */
#undef ENABLE_PYTHON

/* "build regrid_data_plane" */
Expand All @@ -84,7 +84,7 @@
/* "build tc_utils" */
#undef ENABLE_TC_UTILS

/* "build unstructured grid with Atlas and eckit libraries" */
/* "build unstructured grid support" */
#undef ENABLE_UGRID

/* "build wavelet_stat" */
Expand Down
Loading

0 comments on commit 6ce4634

Please sign in to comment.