Skip to content

Commit

Permalink
Merge pull request #21 from podaac/release/4.9.8
Browse files Browse the repository at this point in the history
Release 4.9.8
  • Loading branch information
jamesfwood authored Jul 18, 2023
2 parents 550f73d + 6d64ea6 commit a606352
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 5 deletions.
22 changes: 19 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,18 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Deploy Env Override
if: |
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat'
run: |
message="${{ github.event.head_commit.message }}"
trimmed_message=${message:1} # Remove leading slash
override_env=$(echo "$trimmed_message" | grep -oE '[^[:space:]]+$')
override_env_upper=$(echo "$trimmed_message" | awk '{print toupper($NF)}')
echo "THE_ENV=${override_env}" >> $GITHUB_ENV
echo "TARGET_ENV_UPPERCASE=${override_env_upper}" >> $GITHUB_ENV
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
Expand All @@ -175,7 +187,9 @@ jobs:
if: |
github.ref == 'refs/heads/develop' ||
github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/heads/release')
startsWith(github.ref, 'refs/heads/release') ||
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat'
uses: docker/build-push-action@v3
with:
context: .
Expand Down Expand Up @@ -209,7 +223,9 @@ jobs:
if: |
github.ref == 'refs/heads/develop' ||
github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/heads/release')
startsWith(github.ref, 'refs/heads/release') ||
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat'
working-directory: terraform/
env:
AWS_ACCESS_KEY_ID: ${{ secrets[format('AWS_ACCESS_KEY_ID_SERVICES_{0}', env.TARGET_ENV_UPPERCASE)] }}
Expand All @@ -223,4 +239,4 @@ jobs:
run: |
source bin/config.sh ${{ env.THE_ENV }}
terraform plan -var-file=tfvars/"${{ env.THE_ENV }}".tfvars -var="app_version=${{ env.THE_VERSION }}" -out="tfplan"
terraform apply -auto-approve tfplan
terraform apply -auto-approve tfplan
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed


## [4.9.8]
### Added
- Update github actions to have commit message trigger deploys
- PODAAC-5326: Fixed 'Add matching granules to download' button.
### Changed
### Removed
### Fixed

## [4.9.7]
### Added
- Implement github actions workflow
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@gov.nasa.jpl.podaac/hitide-profile",
"service_name": "hitide-profile",
"version": "4.9.7",
"version": "4.9.8-rc.1",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
5 changes: 5 additions & 0 deletions server/client/harmony.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ async function subset(job, accessToken) {
searchStartDate,
searchEndDate,
granuleIds = [],
granuleNames = [],
variables,
merge
} = job.subjobs[0];
Expand All @@ -27,6 +28,10 @@ async function subset(job, accessToken) {
url += `&subset=lat(${south}:${north})`;
url += `&subset=lon(${west}:${east})`;
//url += `&subset=time("${startDate}":"${endDate}")`;
// add granule names
granuleNames.forEach((granuleName) => {
url += `&granuleName=${granuleName}`;
});
granuleIds.forEach((granuleId) => {
url += `&granuleId=${granuleId}`;
});
Expand Down

0 comments on commit a606352

Please sign in to comment.