From 082880a1dac52e726e626f77a8efb6f9ab7e7d33 Mon Sep 17 00:00:00 2001
From: Mirko Westermeier <mirko.westermeier@uni-muenster.de>
Date: Wed, 6 Sep 2023 17:40:02 +0200
Subject: [PATCH] Use pandoc ubuntu image for upload-pages-artifact
 (actions/upload-pages-artifact#17)

---
 .github/workflows/build-website.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-website.yml b/.github/workflows/build-website.yml
index 54517fa..61e0b52 100644
--- a/.github/workflows/build-website.yml
+++ b/.github/workflows/build-website.yml
@@ -6,12 +6,12 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: docker://pandoc/core:2.14
+      image: docker://pandoc/core:2.14-ubuntu
       options: --entrypoint=sh
     steps:
 
       - name: Install dependencies
-        run: apk add git make m4
+        run: apt update && apt install -y git make m4
 
       - name: Checkout repository content
         uses: actions/checkout@v3
@@ -28,24 +28,22 @@ jobs:
           path: output/public
           name: website
 
-      - name: Prepare tarball for native GH pages
-        run: tar cvf artifact.tar -C output/public .
-
-      - name: Store generated content as tarball for GH pages
-        # actions/upload-pages-artifact is broken with tar --hard-dereference
-        uses: actions/upload-artifact@v3
+      - name: Store generated content for GH pages
+        uses: actions/upload-pages-artifact@v2
         with:
-          path: artifact.tar
-          name: github-pages
+          path: output/public
 
   deploy:
     needs: build
     if: success() && github.ref == 'refs/heads/main'
     runs-on: ubuntu-20.04
+    environment:
+      name: github-pages
+      url: ${{ steps.deploy.outputs.page_url }}
     permissions:
       pages: write
       id-token: write
     steps:
       - name: Deploy to GitHub Pages
-        id: deployment
+        id: deploy
         uses: actions/deploy-pages@v2