revert CI

quiltdata · Nov 18, 2024 · 5e165f1 · 5e165f1
1 parent 907a3a6
commit 5e165f1
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 43 deletions.
diff --git a/.github/workflows/deploy-catalog.yaml b/.github/workflows/deploy-catalog.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - selective-package-download
     paths:
       - '.github/workflows/deploy-catalog.yaml'
       - 'catalog/**'

diff --git a/.github/workflows/deploy-lambdas.yaml b/.github/workflows/deploy-lambdas.yaml
@@ -2,8 +2,8 @@ name: Deploy lambdas to S3 and ECR
 
 on:
   push:
-    # branches:
-    #   - master
+    branches:
+      - master
     paths:
       - '.github/workflows/deploy-lambdas.yaml'
       - 'lambdas/**'
@@ -13,17 +13,17 @@ jobs:
     strategy:
       matrix:
         path:
-          # - access_counts
+          - access_counts
           - indexer
-          # - pkgevents
-          # - pkgpush
-          # - pkgselect
-          # - preview
-          # - s3hash
-          # - s3select
-          # - status_reports
-          # - tabular_preview
-          # - transcode
+          - pkgevents
+          - pkgpush
+          - pkgselect
+          - preview
+          - s3hash
+          - s3select
+          - status_reports
+          - tabular_preview
+          - transcode
     runs-on: ubuntu-latest
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
@@ -63,33 +63,33 @@ jobs:
           s3_key="${{ matrix.path }}/${{ github.sha }}.zip"
           ./lambdas/scripts/upload_zip.sh ./out.zip "$AWS_REGION" "$s3_key"
 
-  # deploy-lambda-ecr:
-  #   strategy:
-  #     matrix:
-  #       path:
-  #         - molecule
-  #         - thumbnail
-  #   runs-on: ubuntu-latest
-  #   # These permissions are needed to interact with GitHub's OIDC Token endpoint.
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Build Docker image
-  #       working-directory: ./lambdas/${{ matrix.path }}
-  #       run: docker buildx build -t "quiltdata/lambdas/${{ matrix.path }}:${{ github.sha }}" -f Dockerfile ..
-  #     - name: Configure AWS credentials from Prod account
-  #       uses: aws-actions/configure-aws-credentials@v4
-  #       with:
-  #         role-to-assume: arn:aws:iam::730278974607:role/github/GitHub-Quilt
-  #         aws-region: us-east-1
-  #     - name: Push Docker image to Prod ECR
-  #       run: ./lambdas/scripts/upload_ecr.sh 730278974607 "quiltdata/lambdas/${{ matrix.path }}:${{ github.sha }}"
-  #     - name: Configure AWS credentials from GovCloud account
-  #       uses: aws-actions/configure-aws-credentials@v4
-  #       with:
-  #         role-to-assume: arn:aws-us-gov:iam::313325871032:role/github/GitHub-Quilt
-  #         aws-region: us-gov-east-1
-  #     - name: Push Docker image to GovCloud ECR
-  #       run: ./lambdas/scripts/upload_ecr.sh 313325871032 "quiltdata/lambdas/${{ matrix.path }}:${{ github.sha }}"
+  deploy-lambda-ecr:
+    strategy:
+      matrix:
+        path:
+          - molecule
+          - thumbnail
+    runs-on: ubuntu-latest
+    # These permissions are needed to interact with GitHub's OIDC Token endpoint.
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build Docker image
+        working-directory: ./lambdas/${{ matrix.path }}
+        run: docker buildx build -t "quiltdata/lambdas/${{ matrix.path }}:${{ github.sha }}" -f Dockerfile ..
+      - name: Configure AWS credentials from Prod account
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::730278974607:role/github/GitHub-Quilt
+          aws-region: us-east-1
+      - name: Push Docker image to Prod ECR
+        run: ./lambdas/scripts/upload_ecr.sh 730278974607 "quiltdata/lambdas/${{ matrix.path }}:${{ github.sha }}"
+      - name: Configure AWS credentials from GovCloud account
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws-us-gov:iam::313325871032:role/github/GitHub-Quilt
+          aws-region: us-gov-east-1
+      - name: Push Docker image to GovCloud ECR
+        run: ./lambdas/scripts/upload_ecr.sh 313325871032 "quiltdata/lambdas/${{ matrix.path }}:${{ github.sha }}"