Merge branch 'main' into bugfix/gwcs_spring_cleaning

spacetelescope · Jan 2, 2025 · 1731b3b · 1731b3b
2 parents d4dd0a7 + adadfaa
commit 1731b3b
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ on:
         type: string
         required: false
         default: ''
-      crds_server_url:
-        description: CRDS server URL
+      crds_server:
+        description: CRDS server
         type: string
         required: false
         default: https://jwst-crds.stsci.edu
@@ -46,17 +46,28 @@ jobs:
       envs: |
         - linux: check-dependencies
         - linux: check-types
+  latest_crds_contexts:
+    uses: ./.github/workflows/contexts.yml
+  crds_context:
+    needs: [ latest_crds_contexts ]
+    runs-on: ubuntu-latest
+    steps:
+      - id: context
+        run: echo context=${{ github.event_name == 'workflow_dispatch' && (inputs.crds_context != '' && inputs.crds_context || needs.latest_crds_contexts.outputs.jwst) || needs.latest_crds_contexts.outputs.jwst }} >> $GITHUB_OUTPUT
+    outputs:
+      context: ${{ steps.context.outputs.context }}
   test:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@9f1f43251dde69da8613ea8e11144f05cdea41d5  # v1.15.0
+    needs: [ crds_context ]
     with:
       setenv: |
         CRDS_PATH: /tmp/data/crds_cache
-        CRDS_SERVER_URL: ${{ inputs.crds_server_url || 'https://jwst-crds.stsci.edu' }}
-        CRDS_CONTEXT: ${{ inputs.crds_context || 'jwst-edit' }}
+        CRDS_SERVER_URL: ${{ github.event_name == 'workflow_dispatch' && inputs.crds_server || 'https://jwst-crds.stsci.edu' }}
+        CRDS_CONTEXT: ${{ needs.crds_context.outputs.context }}
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: /tmp/data/crds_cache
-      cache-key: crds-${{ inputs.crds_context || 'jwst-edit' }}
+      cache-key: crds-${{ needs.crds_context.outputs.context }}
       envs: |
         - linux: py310-oldestdeps-xdist-cov
           pytest-results-summary: true

diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml
@@ -11,8 +11,8 @@ on:
         type: string
         required: false
         default: ''
-      crds_server_url:
-        description: CRDS server URL
+      crds_server:
+        description: CRDS server
         type: string
         required: false
         default: https://jwst-crds.stsci.edu
@@ -22,14 +22,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  latest_crds_contexts:
+    uses: ./.github/workflows/contexts.yml
+  crds_context:
+    needs: [ latest_crds_contexts ]
+    runs-on: ubuntu-latest
+    steps:
+      - id: context
+        run: echo context=${{ github.event_name == 'workflow_dispatch' && (inputs.crds_context != '' && inputs.crds_context || needs.latest_crds_contexts.outputs.jwst) || needs.latest_crds_contexts.outputs.jwst }} >> $GITHUB_OUTPUT
+    outputs:
+      context: ${{ steps.context.outputs.context }}
   test:
     if: (github.repository == 'spacetelescope/jwst' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run scheduled tests')))
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@9f1f43251dde69da8613ea8e11144f05cdea41d5  # v1.15.0
+    needs: [ crds_context ]
     with:
       setenv: |
         CRDS_PATH: /tmp/crds_cache
-        CRDS_SERVER_URL: ${{ inputs.crds_server_url || 'https://jwst-crds.stsci.edu' }}
-        CRDS_CONTEXT: ${{ inputs.crds_context || 'jwst-edit' }}
+        CRDS_SERVER_URL: ${{ github.event_name == 'workflow_dispatch' && inputs.crds_server || 'https://jwst-crds.stsci.edu' }}
+        CRDS_CONTEXT: ${{ needs.crds_context.outputs.context }}
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: /tmp/crds_cache

diff --git a/.github/workflows/contexts.yml b/.github/workflows/contexts.yml
@@ -0,0 +1,24 @@
+name: contexts
+
+on:
+  workflow_call:
+    outputs:
+      jwst:
+        value: ${{ jobs.contexts.outputs.jwst }}
+  workflow_dispatch:
+
+jobs:
+  contexts:
+    name: retrieve latest CRDS contexts
+    runs-on: ubuntu-latest
+    outputs:
+      jwst: ${{ steps.jwst_crds_context.outputs.pmap }}
+    steps:
+      - id: jwst_crds_context
+        env:
+          OBSERVATORY: jwst
+          CRDS_SERVER_URL: https://jwst-crds.stsci.edu
+        run: |
+          pip install crds
+          echo "pmap=$(crds list --resolve-contexts  --contexts jwst-edit)" >> $GITHUB_OUTPUT
+      - run: if [[ ! -z "${{ steps.jwst_crds_context.outputs.pmap }}" ]]; then echo ${{ steps.jwst_crds_context.outputs.pmap }}; else exit 1; fi
diff --git a/.github/workflows/tests_devdeps.yml b/.github/workflows/tests_devdeps.yml
@@ -20,8 +20,8 @@ on:
         type: string
         required: false
         default: ''
-      crds_server_url:
-        description: CRDS server URL
+      crds_server:
+        description: CRDS server
         type: string
         required: false
         default: https://jwst-crds.stsci.edu
@@ -31,14 +31,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  latest_crds_contexts:
+    uses: ./.github/workflows/contexts.yml
+  crds_context:
+    needs: [ latest_crds_contexts ]
+    runs-on: ubuntu-latest
+    steps:
+      - id: context
+        run: echo context=${{ github.event_name == 'workflow_dispatch' && (inputs.crds_context != '' && inputs.crds_context || needs.latest_crds_contexts.outputs.jwst) || needs.latest_crds_contexts.outputs.jwst }} >> $GITHUB_OUTPUT
+    outputs:
+      context: ${{ steps.context.outputs.context }}
   test:
     if: (github.repository == 'spacetelescope/jwst' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run devdeps tests')))
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@9f1f43251dde69da8613ea8e11144f05cdea41d5  # v1.15.0
+    needs: [ crds_context ]
     with:
       setenv: |
         CRDS_PATH: /tmp/data/crds_cache
-        CRDS_SERVER_URL: ${{ inputs.crds_server_url || 'https://jwst-crds.stsci.edu' }}
-        CRDS_CONTEXT: ${{ inputs.crds_context || 'jwst-edit' }}
+        CRDS_SERVER_URL: ${{ github.event_name == 'workflow_dispatch' && inputs.crds_server || 'https://jwst-crds.stsci.edu' }}
+        CRDS_CONTEXT: ${{ needs.crds_context.outputs.context }}
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: /tmp/data/crds_cache