From c8d433753e3c5cd54fe2f6baf588ad67bcedd142 Mon Sep 17 00:00:00 2001 From: ascibisz Date: Wed, 25 Mar 2026 12:01:32 -0700 Subject: [PATCH 1/3] try to fix build --- .github/workflows/build-and-deploy.yml | 33 --------------------- .github/workflows/deploy-prod.yml | 41 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 .github/workflows/deploy-prod.yml diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 3d6c3ce..1f3011f 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -7,10 +7,6 @@ on: push: branches: ['main'] -env: - AWS_REGION: ${{ vars.AWS_DEFAULT_REGION }} - AWS_ACCOUNT_ID: ${{ vars.AWS_CELLS_ACCOUNT_ID }} - permissions: contents: write pages: write @@ -38,32 +34,3 @@ jobs: folder: ./dist clean-exclude: pr-preview/ branch: gh-pages - - deploy-prod: - if: startsWith(github.ref, 'refs/tags/v') - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Add SHORT_SHA env property with commit short sha - run: echo "SHORT_SHA=`echo ${{ github.sha }} | cut -c1-8`" >> $GITHUB_ENV - - - name: Configure AWS credentials with OIDC - uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 - with: - role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/github_cellpack - role-session-name: github_cellpack-${{ env.SHORT_SHA }} - aws-region: ${{ env.AWS_REGION }} - - - name: Set up Bun - uses: oven-sh/setup-bun@v2 - - - name: Install - run: bun install - - - name: Build with Vite - run: bun run build - - - name: Copy files to production bucket - run: aws s3 sync ./dist/ s3://cellpack-datasets/ --delete diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml new file mode 100644 index 0000000..4ee6157 --- /dev/null +++ b/.github/workflows/deploy-prod.yml @@ -0,0 +1,41 @@ +name: deploy-prod +run-name: Deploy to Production +on: pull_request + +env: + AWS_REGION: ${{ vars.AWS_DEFAULT_REGION }} + AWS_ACCOUNT_ID: ${{ vars.AWS_CELLS_ACCOUNT_ID }} + +permissions: + contents: write + pages: write + id-token: write + +jobs: + deploy-prod: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Add SHORT_SHA env property with commit short sha + run: echo "SHORT_SHA=`echo ${{ github.sha }} | cut -c1-8`" >> $GITHUB_ENV + + - name: Configure AWS credentials with OIDC + uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 + with: + role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/github_cellpack + role-session-name: github_cellpack-${{ env.SHORT_SHA }} + aws-region: ${{ env.AWS_REGION }} + + - name: Set up Bun + uses: oven-sh/setup-bun@v2 + + - name: Install + run: bun install + + - name: Build with Vite + run: bun run build + + - name: Copy files to production bucket + run: aws s3 sync ./dist/ s3://cellpack-datasets/ --delete From 0bfd2f770e74cb7ca623d66042e6a056b49c02e7 Mon Sep 17 00:00:00 2001 From: ascibisz Date: Wed, 25 Mar 2026 12:08:44 -0700 Subject: [PATCH 2/3] deploy on push with v tag --- .github/workflows/deploy-prod.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 4ee6157..f7bc155 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -1,6 +1,10 @@ name: deploy-prod run-name: Deploy to Production -on: pull_request + +on: + push: + tags: + - "v*" env: AWS_REGION: ${{ vars.AWS_DEFAULT_REGION }} From a9d7ca747a06410ddb59d29d6cfad049f3037cfb Mon Sep 17 00:00:00 2001 From: ascibisz Date: Wed, 25 Mar 2026 13:41:23 -0700 Subject: [PATCH 3/3] rename build-and-deploy to deploy-staging --- .github/workflows/{build-and-deploy.yml => deploy-staging.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build-and-deploy.yml => deploy-staging.yml} (100%) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/deploy-staging.yml similarity index 100% rename from .github/workflows/build-and-deploy.yml rename to .github/workflows/deploy-staging.yml