simplify deployment actions

Author: Alex-deVis

.github/workflows/deployment.yml

@@ -10,52 +10,26 @@ jobs:
     name: Deploy to GitHub Pages
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        with:
-          path: ./repo
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./repo
-          file: ./repo/Dockerfile
-          push: false
-          load: true
-          tags: operating-systems-jekyll:latest
-          cache-from: type=gha
-          cache-to: type=gha
+      - uses: actions/checkout@v3
 
-      - name: GitHub-specific config
+      - name: Build Jekyll site
         run: |
-          cd repo
+          # GitHub-specific config
           echo "url: https://${{ github.repository_owner }}.github.io" >> _config.yaml
           echo "baseurl: /operating-systems" >> _config.yaml
 
-      - name: Load image
-        run: |
-          mkdir output
-          docker image list
-          docker run -v $GITHUB_WORKSPACE/output:/usr/src/app/_site \
-            -v $GITHUB_WORKSPACE/repo:/usr/src/app operating-systems-jekyll:latest \
-            bundle exec jekyll build
+          # Build Docker image for Jekyll
+          docker build -t jekyll-image .
+
+          # Build Jekyll site
+          docker run --rm \
+            -v ${{ github.workspace }}:/usr/src/app
+            jekyll-image bundle exec jekyll build
 
-      # Popular action to deploy to GitHub Pages:
-      # Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          # Build output to publish to the `gh-pages` branch:
-          publish_dir: ./output
-          # The following lines assign commit authorship to the official
-          # GH-Actions bot for deploys to `gh-pages` branch:
-          # https://github.com/actions/checkout/issues/13#issuecomment-724415212
-          # The GH actions bot is used by default if you didn't specify the two fields.
-          # You can swap them out with your own user credentials.
-          user_name: 'github-actions[bot]'
-          user_email: 'github-actions[bot]@users.noreply.github.com'
+          publish_dir: _site
           publish_branch: gh-pages
           enable_jekyll: true

.github/workflows/pr-deployment.yml

@@ -16,74 +16,52 @@ jobs:
     steps:
       - name: Set Deployment ID
         run: |
-          # Tag manual trigger with "manual-trigger"
-          # Tag PR trigger with PR number
+          # Use PR number for PR trigger and commit SHA for manual trigger
           if [[ -z "${{ github.event.pull_request.number }}" ]]; then
-            echo "DEPLOYMENT_ID=manual-trigger" >> $GITHUB_ENV
+            echo "DEPLOYMENT_ID=trigger-${GITHUB_SHA::7}" >> $GITHUB_ENV
           else
             echo "DEPLOYMENT_ID=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
           fi
           echo "DEPLOYMENT_ID=${{ env.DEPLOYMENT_ID }}"
 
       - uses: actions/checkout@v3
         with:
-          path: ./repo
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: ./repo
-          file: ./repo/Dockerfile
-          push: false
-          load: true
-          tags: operating-systems-${{ env.DEPLOYMENT_ID }}:latest
-          cache-from: type=gha
-          cache-to: type=gha
-
-      - name: GitHub-specific config
+      - name: Build Jekyll site
         run: |
-          cd repo
+          # GitHub-specific config
           echo "url: https://${{ github.repository_owner }}.github.io" >> _config.yaml
           echo "baseurl: /operating-systems/${{ env.DEPLOYMENT_ID }}" >> _config.yaml
 
-      - name: Load Image
-        run: |
-          mkdir -p ${{ env.DEPLOYMENT_ID }}
-          docker image list
-          docker run -v $GITHUB_WORKSPACE/${{ env.DEPLOYMENT_ID }}:/usr/src/app/_site \
-            -v $GITHUB_WORKSPACE/repo:/usr/src/app operating-systems-${{ env.DEPLOYMENT_ID }}:latest \
-            bundle exec jekyll build
-          
+          # Build Docker image for Jekyll
+          docker build -t jekyll-site .
+
+          # Build Jekyll site
+          docker run --rm \
+            -v ${{ github.workspace }}:/usr/src/app/ \
+            jekyll-site bundle exec jekyll build
+
       # Popular action to deploy to GitHub Pages:
       # Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          # Build output to publish to the `gh-pages-pr` branch:
-          publish_dir: ./${{ env.DEPLOYMENT_ID }}
+          publish_dir: _site
           destination_dir: ${{ env.DEPLOYMENT_ID }}
-          # The following lines assign commit authorship to the official
-          # GH-Actions bot for deploys to `gh-pages` branch:
-          # https://github.com/actions/checkout/issues/13#issuecomment-724415212
-          # The GH actions bot is used by default if you didn't specify the two fields.
-          # You can swap them out with your own user credentials.
           publish_branch: gh-pages
           enable_jekyll: true
 
       - name: Add Comment to PR
-        if: ${{ env.DEPLOYMENT_ID != 'manual-trigger' }}
+        if: ${{ !startsWith(env.DEPLOYMENT_ID, 'trigger-') }}
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
             Published at https://${{ github.repository_owner }}.github.io/operating-systems/${{ env.DEPLOYMENT_ID }}/
 
       - name: Output Deployment URL
-        if: ${{ env.DEPLOYMENT_ID == 'manual-trigger' }}
+        if: ${{ startsWith(env.DEPLOYMENT_ID, 'trigger-') }}
         run: |
           echo "The deployment is available at https://${{ github.repository_owner }}.github.io/operating-systems/${{ env.DEPLOYMENT_ID }}/"