feat(stacks.api): setup pipeline tools via new builder methods

Signed-off-by: Braden Mars <bradenmars@bradenmars.me>
CrisisCleanup · Aug 23, 2023 · dd2201d · dd2201d
1 parent e968780
commit dd2201d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -62,26 +62,27 @@ jobs:
         with:
           repository: CrisisCleanup/infrastructure
           ref: main
-      - name: Install Helm
-        uses: azure/setup-helm@v3
-        with:
-          version: 3.12.2
-      - name: Install AWS CLI
-        uses: unfor19/install-aws-cli-action@v1
-        if: inputs.runner == 'self-hosted'
-        with:
-          arch: arm64
-      - name: Install SOPs
-        uses: CrisisCleanup/mozilla-sops-action@main
-        with:
-          version: 3.7.3
       - name: Setup PNPM
         uses: pnpm/action-setup@v2.4.0
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
           node-version: "18"
           cache: pnpm
+      - name: Install SOPs
+        uses: CrisisCleanup/mozilla-sops-action@main
+        with:
+          version: 3.7.3
+      - name: Install AWS CLI
+        uses: unfor19/install-aws-cli-action@v1
+        if: runner.arch == 'ARM64' || inputs.runner == 'self-hosted'
+        with:
+          arch: arm64
+          version: 2.13.11
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: 3.12.2
       - name: Authenticate Via OIDC Role
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
@@ -191,6 +192,12 @@ jobs:
           echo ::add-mask::${{secrets.AWS_ACCOUNT_ID_DEVELOPMENT}}
           echo ::add-mask::${{secrets.AWS_ACCOUNT_ID_STAGING}}
           echo ::add-mask::${{secrets.AWS_ACCOUNT_ID_PRODUCTION}}
+      - name: Install AWS CLI
+        uses: unfor19/install-aws-cli-action@v1
+        if: runner.arch == 'ARM64' || inputs.runner == 'self-hosted'
+        with:
+          arch: arm64
+          version: 2.13.11
       - name: Authenticate Via OIDC Role
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
@@ -722,3 +729,4 @@ jobs:
           role-arn: arn:aws:iam::${{secrets.AWS_ACCOUNT_ID_PRODUCTION}}:role/cdk-hnb659fds-cfn-exec-role-${{secrets.AWS_ACCOUNT_ID_PRODUCTION}}-us-east-1
 concurrency:
   group: deploy-infra
+  cancel-in-progress: false
diff --git a/packages/stacks/api/src/gh.ts b/packages/stacks/api/src/gh.ts
@@ -225,6 +225,7 @@ class PipelineBuilder {
 				packageName: 'stacks.api',
 				workingDirectory: 'packages/stacks/api',
 			})
+			.defaultTools()
 			.clone({ workflowTriggers: {} })
 			.build(scope, props.name)
 			.onWorkflowCall({