From 3e8effae0fd5d7f958aa3dc28bcf0ba90364844e Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Mon, 5 Aug 2024 23:22:03 -0400 Subject: [PATCH 1/3] Fix build. --- .github/workflows/deploy.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b3f31d79..378c6891 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -23,10 +23,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v3 - - name: Install dependencies - run: npm ci + - name: Install Bun + uses: oven-sh/setup-bun@v1 - name: Install doctl uses: digitalocean/action-doctl@v2 @@ -34,7 +34,7 @@ jobs: token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }} - name: Build - run: ./build.sh + run: make - name: Upload artifact uses: actions/upload-pages-artifact@v3 @@ -45,6 +45,9 @@ jobs: uses: actions/deploy-pages@v4 id: deployment + - name: Clean up for S3 + run: make clean-up-s3 + - name: Upload to S3 run: | export sync_args=( "--delete" "--acl" "public-read" "dist" "s3://${{ vars.AWS_S3_BUCKET }}/${{ env.BUCKET_PATH }}" ) From 5262c26b757002ece90bbd9367878ed54752734c Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Mon, 5 Aug 2024 23:25:50 -0400 Subject: [PATCH 2/3] Add basic workflow for builds. This way we can avoid the if condition logic for just checking CSS builds. --- .github/workflows/build.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 00000000..315fb7dc --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,25 @@ +name: Build + +on: + push: + paths: + - 'build/**/' + - 'legacy/*' + - 'package.json' + - 'src/**/*' + - '.github/workflows/build.yaml' + +jobs: + build-and-deploy: + name: Build CSS + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Install Bun + uses: oven-sh/setup-bun@v1 + + - name: Build + run: make From 2359b746e0b58525986b1cc138ed575d12910265 Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Mon, 5 Aug 2024 23:29:19 -0400 Subject: [PATCH 3/3] Fix step name. --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 315fb7dc..85a435e2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ on: - '.github/workflows/build.yaml' jobs: - build-and-deploy: + build: name: Build CSS runs-on: ubuntu-latest