Merge remote-tracking branch 'refs/remotes/origin/main' into develop

# Conflicts: # pyproject.toml
podaac · Jul 29, 2024 · 0ca10fc · 0ca10fc
2 parents 9c2ed5d + 8bdd36f
commit 0ca10fc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml
@@ -370,7 +370,7 @@ jobs:
           pip install tenacity
           ${GITHUB_WORKSPACE}/.github/workflows/wait-for-pypi.py ${{needs.build.outputs.pyproject_name}}[harmony]==${{ needs.build.outputs.version }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/Dockerfile
@@ -401,6 +401,5 @@ jobs:
         if: |
           github.ref == 'refs/heads/main'    ||
           startsWith(github.ref, 'refs/heads/release')
-        working-directory: deployment
         run: 
           echo "Deploy $CONTAINER_IMAGE_URI to $ENV"
diff --git a/.github/workflows/release-created.yml b/.github/workflows/release-created.yml
@@ -16,14 +16,21 @@ jobs:
       ${{ startsWith(github.ref, 'refs/heads/release/') }}
     steps:
       # Checks-out the develop branch
+      - uses: getsentry/action-github-app-token@v3
+        name: podaac cicd token
+        id: podaac-cicd
+        with:
+          app_id: ${{ secrets.CICD_APP_ID }}
+          private_key: ${{ secrets.CICD_APP_PRIVATE_KEY }}
       - uses: actions/checkout@v4
         with:
-          ref: 'refs/heads/develop'
-      - uses: actions/setup-python@v4
+          repository: ${{ github.repository }}
+          token: ${{ steps.podaac-cicd.outputs.token }}
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install Poetry
-        uses: abatilo/actions-poetry@v2.0.0
+        uses: abatilo/actions-poetry@v3
         with:
           poetry-version: 1.3.2
       - name: Bump minor version

diff --git a/cmr/netcdf_cmr_umm_s.json b/cmr/netcdf_cmr_umm_s.json
@@ -36,11 +36,6 @@
       "ServiceSpecificTerm": "DATA REFORMATTING"
     }
   ],
-  "MetadataSpecification": {
-    "URL": "https://cdn.earthdata.nasa.gov/umm/service/v1.4",
-    "Name": "UMM-S",
-    "Version": "1.4"
-  },
   "ContactGroups": [
     {
       "Roles": [
@@ -68,5 +63,10 @@
       "Type": "VIEW RELATED INFORMATION",
       "Subtype": "GENERAL DOCUMENTATION"
     }
-  ]
+  ],
+    "MetadataSpecification": {
+        "URL": "https://cdn.earthdata.nasa.gov/umm/service/v1.5.2",
+        "Name": "UMM-S",
+        "Version": "1.5.2"
+    }
 }
diff --git a/cmr/associations.txt → cmr/ops_associations.txt b/cmr/associations.txt → cmr/ops_associations.txt
diff --git a/cmr/uat_associations.txt b/cmr/uat_associations.txt
@@ -0,0 +1 @@
+C1247485690-LARC_CLOUD