From d5c4855a3e0fef68535162b45928dadeed477188 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com>
Date: Sun, 5 May 2024 21:07:50 +0100
Subject: Fixes workflow and moves package.json to root directory

---
 .github/workflows/build-and-deploy.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 8b5add3..d2b1374 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -30,11 +30,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build with Astro
-        run: npx astro build
+        run: npm run build
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          aws-region: eu-west-2
+          aws-region: us-east-1
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Sync S3 bucket
@@ -42,4 +42,5 @@ jobs:
           aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
           aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
           aws configure set region eu-west-2
-          aws s3 sync ./dist/ "s3://joeac.net-$S3_BUCKET_SUFFIX" --delete
+          aws s3 sync ./website/dist/ "s3://joeac.net-$S3_BUCKET_SUFFIX" --delete
+
-- 
cgit v1.2.3