From bf634192aa184462b42213930727b40c800a8399 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 2 Jan 2025 12:17:03 -0500 Subject: [PATCH] Revert "hotfix for merge conflict" This reverts commit 8b5e7bf858abebe5eaff5af512eb1730d9aa6014. --- .github/workflows/ci.yml | 1 + .github/workflows/ci_cron.yml | 1 + .github/workflows/tests_devdeps.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9dceff2eff..1d712bc1a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: - linux: check-types 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 diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml index 1822318bbf..3f19dbe425 100644 --- a/.github/workflows/ci_cron.yml +++ b/.github/workflows/ci_cron.yml @@ -25,6 +25,7 @@ jobs: 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 diff --git a/.github/workflows/tests_devdeps.yml b/.github/workflows/tests_devdeps.yml index 5f79a9982d..8db7c09c01 100644 --- a/.github/workflows/tests_devdeps.yml +++ b/.github/workflows/tests_devdeps.yml @@ -34,6 +34,7 @@ jobs: 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