From 6ff3e2da60f6677b73602a9d6cdc135ce99d712d Mon Sep 17 00:00:00 2001 From: Sujit Kumar <60378235+therealsujitk@users.noreply.github.com> Date: Wed, 27 Dec 2023 12:06:41 +0530 Subject: [PATCH 1/3] Add step to deploy to GitHub Pages --- .github/workflows/docker-image.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d4f37f3..766b944 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,6 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Build the website - run: docker-compose run --rm middleman bundle exec middleman build + - uses: actions/checkout@v3 + + - name: Build the website + run: docker-compose run --rm middleman bundle exec middleman build + + - name: Deploy the website + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./build From 20657383035b3b0ce521503fc33d65d0fba2fab0 Mon Sep 17 00:00:00 2001 From: Sujit Kumar <60378235+therealsujitk@users.noreply.github.com> Date: Wed, 27 Dec 2023 15:10:26 +0530 Subject: [PATCH 2/3] Add separate workflows for pushes and pull requests --- .github/workflows/build_pull_request.yml | 17 +++++++++++++++++ .../{docker-image.yml => build_push.yml} | 4 +--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build_pull_request.yml rename .github/workflows/{docker-image.yml => build_push.yml} (88%) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml new file mode 100644 index 0000000..6b2cb04 --- /dev/null +++ b/.github/workflows/build_pull_request.yml @@ -0,0 +1,17 @@ +name: PR Build + +on: + pull_request: + branches: [ main ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Build the website + run: docker-compose run --rm middleman bundle exec middleman build diff --git a/.github/workflows/docker-image.yml b/.github/workflows/build_push.yml similarity index 88% rename from .github/workflows/docker-image.yml rename to .github/workflows/build_push.yml index 766b944..c3c58d8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/build_push.yml @@ -1,10 +1,8 @@ -name: Website CI +name: Build & Deploy on: push: branches: [ main ] - pull_request: - branches: [ main ] jobs: From 91e2b0935243f20e30ae7fb6822282fe0c43108e Mon Sep 17 00:00:00 2001 From: Sujit Kumar <60378235+therealsujitk@users.noreply.github.com> Date: Tue, 2 Jan 2024 23:59:04 +0530 Subject: [PATCH 3/3] Check if action event is push before deploying --- .github/workflows/build_pull_request.yml | 17 ----------------- .../{build_push.yml => docker-image.yml} | 7 +++++-- 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/build_pull_request.yml rename .github/workflows/{build_push.yml => docker-image.yml} (78%) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml deleted file mode 100644 index 6b2cb04..0000000 --- a/.github/workflows/build_pull_request.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: PR Build - -on: - pull_request: - branches: [ main ] - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Build the website - run: docker-compose run --rm middleman bundle exec middleman build diff --git a/.github/workflows/build_push.yml b/.github/workflows/docker-image.yml similarity index 78% rename from .github/workflows/build_push.yml rename to .github/workflows/docker-image.yml index c3c58d8..8f7450b 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/docker-image.yml @@ -1,8 +1,10 @@ -name: Build & Deploy +name: Website CI on: push: - branches: [ main ] + branches: main + pull_request: + branches: main jobs: @@ -17,6 +19,7 @@ jobs: run: docker-compose run --rm middleman bundle exec middleman build - name: Deploy the website + if: github.event_name == 'push' uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }}