Do more work in the workflow

Lets avoid bash scripts.
GSA-TTS · Jan 5, 2025 · faffed1 · faffed1
1 parent cd39054
commit faffed1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/deploy-to-dev.yaml b/.github/workflows/deploy-to-dev.yaml
@@ -24,6 +24,16 @@ jobs:
       # Checkout the repository to the runner
       - name: Checkout
         uses: actions/checkout@v4
-      # `make dev`
-      - name: Terraform init ; plan ; apply
-        run: terraform/bin/deploy-dev.bash
+      - name: Install Terraform
+        run: |
+          curl -k -O -L https://github.com/cloudfoundry/cli/releases/download/v8.8.0/cf8-cli-installer_8.8.0_x86-64.deb
+          sudo apt-get install --assume-yes ./cf8-cli-installer_8.8.0_x86-64.deb
+      - name: Authenticate against Cloud.gov
+        run: |
+          cf api api.fr.cloud.gov
+          cf auth ${{ secrets.CF_USERNAME }} ${{ secrets.CF_PASSWORD }}
+      - name: Run `make dev` (terraform init -> plan -> apply)
+        run: |
+          pushd ${GITHUB_WORKSPACE}/terraform
+          make dev
+          popd
diff --git a/terraform/bin/deploy-dev.bash b/terraform/bin/deploy-dev.bash
@@ -3,16 +3,6 @@
 # This script runs in the GH Actions environment.
 # Running and testing locally will not work.
 
-sudo apt-get update
-sudo apt-get install -y zip python
-
-# Install CF CLI
-curl -k -O -L https://github.com/cloudfoundry/cli/releases/download/v8.8.0/cf8-cli-installer_8.8.0_x86-64.deb
-sudo apt-get install --assume-yes ./cf8-cli-installer_8.8.0_x86-64.deb
-
-# Authenticate against Cloud.gov
-cf api api.fr.cloud.gov
-cf auth ${{ secrets.CF_USERNAME }} ${{ secrets.CF_PASSWORD }}
 
 # Run the Terraform for deploying to `dev`
 pushd ${GITHUB_WORKSPACE}/terraform