Skip to content

Commit

Permalink
Merge pull request #51 from podaac/release/4.17.0
Browse files Browse the repository at this point in the history
Release 4.17.0
  • Loading branch information
jamesfwood authored Feb 29, 2024
2 parents 4b460be + 0018e5a commit 2bad227
Show file tree
Hide file tree
Showing 24 changed files with 129 additions and 919 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
steps:
# Checkout
- name: Checkout project to build and deploy
uses: actions/checkout@v2
uses: actions/checkout@v4

## Read the json file into the environment variables
- name: JSON to variables
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
git push origin "${{ env.THE_VERSION }}" --force
- name: Publish UMM-T with new version
uses: podaac/cmr-umm-updater@0.5.0
uses: podaac/cmr-umm-updater@0.6.0
if: |
github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/heads/release')
Expand All @@ -180,7 +180,7 @@ jobs:

# Setup Node to install and test
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 14

Expand All @@ -207,7 +207,7 @@ jobs:
echo "TARGET_ENV_UPPERCASE=${override_env_upper}" >> $GITHUB_ENV
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v4
with:
aws-region: us-west-2
role-session-name: GitHubActions
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/release_created.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:

# Checks-out the develop branch
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: 'refs/heads/develop'
- name: Bump minor version
Expand Down
24 changes: 14 additions & 10 deletions .github/workflows/umm_t_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Hourly Build Sync CMR Association Text Files
# Controls when the workflow will run
on:
schedule:
- cron: '0 * * * *'
- cron: '0 9 * * *'
push:
branches:
- develop
Expand All @@ -17,13 +17,12 @@ jobs:
name: Build, Test, Deploy
# The type of runner that the job will run on
runs-on: ubuntu-latest

steps:
# Checkout
- name: Checkout project to build and deploy
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: 3.9

Expand All @@ -32,36 +31,41 @@ jobs:

- name: Run cmr_association_diff command
id: cmr_association_diff

run: |
update_git_message="Adding collections"
OPS_COLLECTION=$(set +x; cmr_association_diff -e ops -t tool -a ${{ github.workspace }}/cmr/ops_associations.txt -p POCLOUD -n 'HiTIDE' -o ${{ github.workspace }}/ops_output_json.txt --token ${{secrets.LAUNCHPAD_TOKEN_OPS}}; set -x)
if [[ ${OPS_COLLECTION} ]]; then
python -u ${{ github.workspace }}/Jenkins/read_collection.py -e ops -i ${{ github.workspace }}/ops_output_json.txt -o ${{ github.workspace }}
python -u ${{ github.workspace }}/.github/workflows/read_collection.py -e ops -i ${{ github.workspace }}/ops_output_json.txt -o ${{ github.workspace }}
ops_success_collection=$(cat ${{ github.workspace }}/ops_success.txt | tr -d '\n')
update_git_message+=" OPS: $ops_success_collection"
cat ${{ github.workspace }}/ops_success.txt >> ${{ github.workspace }}/cmr/ops_associations.txt
fi
UAT_COLLECTION=$(set +x; cmr_association_diff -e uat -t tool -a ${{ github.workspace }}/cmr/uat_associations.txt -p POCLOUD -n 'HiTIDE' -o ${{ github.workspace }}/uat_output_json.txt --token ${{secrets.LAUNCHPAD_TOKEN_UAT}}; set -x)
if [[ ${UAT_COLLECTION} ]]; then
python -u ${{ github.workspace }}/Jenkins/read_collection.py -e uat -i ${{ github.workspace }}/uat_output_json.txt -o ${{ github.workspace }}
python -u ${{ github.workspace }}/.github/workflows/read_collection.py -e uat -i ${{ github.workspace }}/uat_output_json.txt -o ${{ github.workspace }}
uat_success_collection=$(cat ${{ github.workspace }}/uat_success.txt | tr -d '\n')
update_git_message+=" UAT: $uat_success_collection"
cat ${{ github.workspace }}/uat_success.txt >> ${{ github.workspace }}/cmr/uat_associations.txt
fi
echo "::set-output name=ops_collection::$OPS_COLLECTION"
echo "::set-output name=uat_collection::$UAT_COLLECTION"
echo "::set-output name=update_git_message::$update_git_message"
echo "ops_collection=$OPS_COLLECTION" >> "$GITHUB_OUTPUT"
echo "uat_collection=$UAT_COLLECTION" >> "$GITHUB_OUTPUT"
echo "update_git_message=$update_git_message" >> "$GITHUB_OUTPUT"
#echo "::set-output name=ops_collection::$OPS_COLLECTION"
#echo "::set-output name=uat_collection::$UAT_COLLECTION"
#echo "::set-output name=update_git_message::$update_git_message"
- name: Push Develop
env:
OPS_COLLECTION: ${{ steps.cmr_association_diff.outputs.ops_collection }}
UAT_COLLECTION: ${{ steps.cmr_association_diff.outputs.uat_collection }}
UPDATE_GIT_MESSAGE: ${{ steps.cmr_association_diff.outputs.update_git_message }}
run: |
if [[ -z "${{ env.UAT_COLLECTIONS }}" && -z "${{ env.OPS_COLLECTIONS }}" ]]; then
if [[ -z "${{ env.UAT_COLLECTION }}" && -z "${{ env.OPS_COLLECTION }}" ]]; then
echo "No collections were different."
else
git config --global user.name 'hitide-ui bot'
Expand Down
14 changes: 11 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed


## [4.17.0]
### Added
- Added global_grid configuration check to make a global extent for images.
### Changed
### Removed
### Fixed
- issue-42: Fixed collection thumbnails not loading for certain collections
- issue-48: Fixed collection resolution error handling
- issue-49: Removed unused Docker and Jenkins folders/files from HiTIDE-UI
- issue-52: Fixed missing thumbnail placeholder

## [4.16.2]
### Added
### Changed
### Removed
### Fixed
- issue-38: Removed shortName retrieval operation from variable graphql query


## [4.16.1]
### Added
### Changed
Expand All @@ -27,7 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- issue-33: Fixed collection resolution displaying multiple resolutions and scaling


## [4.16.0]
### Added
### Changed
Expand All @@ -40,7 +49,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- issue-15: Fixed color palette error in the legend when selecting datasets


## [4.15.0]
### Added
- issue-17: Add way to read config files to allow for multiple lat lon for variables images.
Expand Down
Loading

0 comments on commit 2bad227

Please sign in to comment.