OK

2 files changed, 59 insertions, 27 deletions

diff --git a/.github/actions/stasis/action.yml b/.github/actions/stasis/action.yml
index 3f43c58..d0b9965 100644
--- a/.github/actions/stasis/action.yml
+++ b/.github/actions/stasis/action.yml
@@ -1,7 +1,7 @@
 name: STASIS
 
 description: |
-  Executes the STASIS with arguments
+  Executes STASIS with arguments
 
 inputs:
   prefix:
@@ -151,12 +151,6 @@ runs:
   steps:
     - uses: actions/checkout@v4
 
-    - name: Install STASIS dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ca-certificates cmake libcurl4-openssl-dev libxml2-dev rsync
-      shell: bash
-
     - name: Set TMPDIR
       run: |
         echo TMPDIR=${{ runner.temp }} >> $GITHUB_ENV
@@ -175,24 +169,11 @@ runs:
         done
       shell: bash
 
-    - uses: actions/checkout@v4
+    - name: Install STASIS
+      uses: ./.github/actions/stasis_install
       with:
-        repository: 'spacetelescope/stasis'
-        path: ${{ github.workspace }}/stasis
-
-    - name: Build STASIS
-      run: |
-        rm -rf ${{ github.workspace }}/stasis/build
-        cd ${{ github.workspace }}/stasis
-        mkdir -p build
-        cd build
-        cmake .. \
-            -DCMAKE_INSTALL_PREFIX="${{ inputs.prefix }}" \
-            -DCMAKE_BUILD_TYPE="RelWithDebInfo"
-        make
-        make install
-        echo "PATH=${{ inputs.prefix }}/bin:$PATH" >> $GITHUB_ENV
-      shell: bash
+        prefix: ${{ github.workflow }}/.local
+        build_type: RelWithDebInfo
 
     - name: Configure program arguments
       run: |
@@ -251,10 +232,7 @@ runs:
 
     - name: Run STASIS
       run: |
-        set -x
-        set -v
         args=""
-
         for arg in $(compgen -A variable | grep option_); do
             args+="${!arg} "
         done
diff --git a/.github/actions/stasis_install/action.yml b/.github/actions/stasis_install/action.yml
new file mode 100644
index 0000000..fb61e49
--- /dev/null
+++ b/.github/actions/stasis_install/action.yml
@@ -0,0 +1,54 @@
+name: Install STASIS
+
+description: |
+  Installs STASIS
+
+inputs:
+  prefix:
+    type: string
+    description: STASIS installation prefix
+    required: false
+    default: "${{ github.workspace }}/.local"
+
+  build_type:
+    type: string
+    description: |
+      Type of build:
+        Release, RelWithDebInfo, Debug, or MinSizeRel
+    required: false
+    default: "${{ github.workspace }}/.local"
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v4
+
+    - uses: actions/checkout@v4
+      with:
+        repository: 'spacetelescope/stasis'
+        path: ${{ github.workspace }}/stasis
+
+    - name: Install STASIS dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ca-certificates cmake libcurl4-openssl-dev libxml2-dev rsync
+      shell: bash
+
+    - name: Install STASIS
+      run: |
+        rm -rf ${{ github.workspace }}/stasis/build
+        cd ${{ github.workspace }}/stasis
+        mkdir -p build
+        cd build
+        cmake .. \
+            -DCMAKE_INSTALL_PREFIX="${{ inputs.prefix }}" \
+            -DCMAKE_BUILD_TYPE="${{ inputs.build_type }}"
+        make
+        make install
+        echo "PATH=${{ inputs.prefix }}/bin:$PATH" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Remove STASIS source
+      run: |
+        rm -rf ${{ github.workspace }}/stasis
+