Skip to content

Commit

Permalink
call romanisim workflows directly
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharyburnett committed Nov 20, 2024
1 parent d4c65f3 commit 4cc4f36
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 100 deletions.
31 changes: 13 additions & 18 deletions .github/workflows/downstream.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Downstream
name: test downstream packages

on:
workflow_dispatch:
Expand All @@ -16,9 +16,6 @@ on:
tags:
- '*'

env:
DATA_PATH: /tmp/data

# Only cancel in-progress jobs or runs for the current workflow
# This cancels the already triggered workflows for a specific PR without canceling
# other instances of this workflow (other PRs, scheduled triggers, etc) when something
Expand All @@ -32,14 +29,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- id: data_path
run: echo "path=${{ env.DATA_PATH }}" >> $GITHUB_OUTPUT
run: echo "path=${{ runner.temp }}/data" >> $GITHUB_OUTPUT
outputs:
data_path: ${{ steps.data_path.outputs.path }}

crds_contexts:
uses: ./.github/workflows/contexts.yml


jwst:
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@924441154cf3053034c6513d5e06c69d262fb9a6 # v1.13.0
needs: [ environment, crds_contexts ]
Expand Down Expand Up @@ -68,27 +64,26 @@ jobs:
envs: |
- linux: py311-test-romancal-cov-xdist
get_romanism_data:
uses: ./.github/workflows/webbpsf_data.yml

romanisim_data_cache:
needs: [ get_romanism_data ]
uses: ./.github/workflows/get_webbpsf.yml
romanisim_data:
needs: [ environment ]
uses: spacetelescope/romanisim/.github/workflows/retrieve_cache.yml@develop
with:
cache_path: ${{ needs.environment.outputs.data_path }}

romanisim:
needs: [ romanisim_data_cache ]
needs: [ romanisim_data ]
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@924441154cf3053034c6513d5e06c69d262fb9a6 # v1.13.0
with:
libraries: |
brew:
- eigen
- fftw
setenv: |
WEBBPSF_PATH: ${{ needs.romanisim_data_cache.outputs.cache_path }}webbpsf-data/
GALSIM_CAT_PATH: ${{ needs.romanisim_data_cache.outputs.cache_path }}galsim_data/real_galaxy_catalog_23.5_example.fits
WEBBPSF_PATH: ${{ needs.romanisim_data.outputs.cache_path }}/webbpsf-data/
GALSIM_CAT_PATH: ${{ needs.romanisim_data.outputs.cache_path }}/galsim_data/real_galaxy_catalog_23.5_example.fits
FFTW_DIR: /opt/homebrew/opt/fftw/lib/
cache-path: ${{ needs.romanisim_data_cache.outputs.cache_path }}
cache-key: ${{ needs.romanisim_data_cache.outputs.cache_key }}
cache-path: ${{ needs.romanisim_data.outputs.cache_path }}
cache-key: ${{ needs.romanisim_data.outputs.cache_key }}
envs: |
- linux: py311-test-romanisim-cov-xdist
Expand All @@ -111,4 +106,4 @@ jobs:
default_python: '3.11'
envs: |
- linux: ndcube
- linux: dkist
- linux: dkist
31 changes: 0 additions & 31 deletions .github/workflows/get_webbpsf.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/romanisim_data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: download and cache romanisim data

on:
workflow_call:
schedule:
- cron: "42 4 * * 3"
workflow_dispatch:
inputs:
webbpsf_minimal:
description: minimal WebbPSF dataset
type: boolean
required: false
default: true

jobs:
download_romanisim_data:
uses: spacetelescope/romanisim/.github/workflows/data.yml@develop
with:
minimal: ${{ github.event_name != 'workflow_dispatch' && true || inputs.webbpsf_minimal }}
51 changes: 0 additions & 51 deletions .github/workflows/webbpsf_data.yml

This file was deleted.

0 comments on commit 4cc4f36

Please sign in to comment.