Merge pull request #58 from barrettruth/fix/ci

fix ci

.github/workflows/ci.yaml

@@ -1,5 +1,4 @@
-name: CI
+name: ci
-
 on:
   pull_request:
     branches: [main]
@@ -7,30 +6,16 @@ on:
     branches: [main]
 
 jobs:
-  lint:
+  ci:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout
+      - uses: actions/checkout@v4
-        uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
-
+      - uses: actions/setup-node@v4
-      - name: Setup PNPM
-        uses: pnpm/action-setup@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "pnpm"
-
+      - run: pnpm install
-      - name: Install dependencies
+      - run: pnpm prettier --check .
-        run: pnpm install
+      - run: pnpm astro check
-
+      - run: pnpm build
-      - name: Prettier check
-        run: pnpm prettier --check .
-
-      - name: Astro check
-        run: pnpm astro check
-
-      - name: Build
-        run: pnpm build

.github/workflows/deploy.yaml

@@ -1,5 +1,4 @@
-name: Deploy to AWS S3
+name: deploy
-
 on:
   workflow_run:
     workflows: ["CI"]
@@ -10,44 +9,21 @@ jobs:
   deploy:
     if: >
       github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.head_branch == 'main'
+      github.event.workflow_run.pull_requests[0].base.ref == 'main'
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - uses: actions/checkout@v4
-        uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v4
-
+      - uses: actions/setup-node@v4
-      - name: Setup PNPM
-        uses: pnpm/action-setup@v2
         with:
-          version: 8
+          node-version: 20
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
           cache: "pnpm"
-
+      - run: pnpm install
-      - name: Install dependencies
+      - run: pnpm build
-        run: pnpm install
+      - uses: aws-actions/configure-aws-credentials@v2
-
-      - name: Build site
-        run: pnpm build
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
-
+      - run: chmod +x scripts/deploy.sh && scripts/deploy.sh
-      - name: Deploy static site to S3 bucket
+      - run: chmod +x scripts/invalidate.sh && scripts/invalidate.sh
-        run: |
-          chmod +x scripts/deploy.sh
-          scripts/deploy.sh
-
-      - name: Invalidate CloudFront cache
-        env:
-          AWS_CLOUDFRONT_DISTRIBUTION_ID: ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION_ID }}
-        run: |
-          chmod +x scripts/invalidate.sh
-          scripts/invalidate.sh