Update cleanup CI

firesim · Mar 2, 2023 · ddc26bf · ddc26bf
1 parent 6b72e41
commit ddc26bf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/firesim-cleanup.yml b/.github/workflows/firesim-cleanup.yml
@@ -28,8 +28,15 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TERM: xterm-256-color
+    defaults:
+      run:
+        shell: bash -el {0}
     steps:
       - uses: actions/checkout@v3
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          environment-file: conda-reqs/ci-shared.yaml
+          miniforge-version: latest
       - uses: ./.github/actions/repo-setup-aws
       - run: .github/scripts/cull-old-ci-instances.py
       - if: ${{ failure() }}
@@ -46,7 +53,14 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TERM: xterm-256-color
+    defaults:
+      run:
+        shell: bash -el {0}
     steps:
       - uses: actions/checkout@v3
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          environment-file: conda-reqs/ci-shared.yaml
+          miniforge-version: latest
       - uses: ./.github/actions/repo-setup-aws
       - run: .github/scripts/cull-old-ci-runners.py
diff --git a/.github/workflows/firesim-run-tests.yml b/.github/workflows/firesim-run-tests.yml
@@ -108,8 +108,7 @@ jobs:
         with:
           environment-file: conda-reqs/ci-shared.yaml
           miniforge-version: latest
-      - name: Install Python CI requirements
-        uses: ./.github/actions/repo-setup-aws
+      - uses: ./.github/actions/repo-setup-aws
       - name: Launch AWS instance used for the FireSim manager (instance info found here)
         run: ./.github/scripts/launch-manager-instance.py
       - name: Setup N Github Actions Runners on AWS instance