Merge ee826cbdec into 4fe4c4ab83

.dockerignore

@@ -4,7 +4,6 @@
 
 !adventure
 !backgrounds
-!bastions
 !bestiary
 !book
 !characters
@@ -12,16 +11,13 @@
 !classes
 !conditionsdiseases
 !covers
-!crochetpatterns
 !decks
 !deities
 !dmscreen
 !feats
-!hazards
 !items
 !languages
 !objects
-!optionalfeatures
 !pdf
 !plutonium
 !races

.gitattributes

@@ -18,14 +18,9 @@
 .gitattributes             text eol=lf
 .gitignore                 text eol=lf
 .eslintignore              text eol=lf
+.eslintrc.cjs              text eol=lf
 .gitmodules                text eol=lf
 .node-version              text eol=lf
 manifest.webmanifest       text eol=lf
 docker/*.conf              text eol=lf
 Dockerfile                 text eol=lf
-
-*.zip                      -text
-*.webp                     -text
-*.pdf                      -text
-*.woff2                    -text
-*.otf                      -text

.github/workflows/main.yml

@@ -20,24 +20,6 @@ jobs:
    create-release:
       runs-on: ubuntu-latest
       steps:
-         - name: Free Disk Space
-           uses: endersonmenezes/free-disk-space@v3
-           with:
-              remove_android: true
-              remove_dotnet: true
-              remove_haskell: true
-              remove_tool_cache: true
-              remove_swap: true
-              remove_packages: "azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox postgresql* temurin-* *llvm* mysql* dotnet-sdk-*"
-              remove_packages_one_command: true
-              remove_folders: "/usr/share/swift /usr/share/miniconda /usr/share/az* /usr/local/share/chromium /usr/local/share/powershell /usr/local/julia /usr/local/aws-cli /usr/local/aws-sam-cli /usr/share/gradle"
-              rm_cmd: "rmz"
-              rmz_version: "3.1.1"
-
-         - uses: actions/setup-node@v4
-           with:
-              node-version: 'lts/*'
-
          -  uses: actions/checkout@master
 
          -  name: Archive Images
@@ -60,26 +42,20 @@ jobs:
    create-image:
       runs-on: ubuntu-latest
       steps:
-         - name: Free Disk Space
-           uses: endersonmenezes/free-disk-space@v3
-           with:
-              remove_android: true
-              remove_dotnet: true
-              remove_haskell: true
-              remove_tool_cache: true
-              remove_swap: true
-              remove_packages: "azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox postgresql* temurin-* *llvm* mysql* dotnet-sdk-*"
-              remove_packages_one_command: true
-              remove_folders: "/usr/share/swift /usr/share/miniconda /usr/share/az* /usr/local/share/chromium /usr/local/share/powershell /usr/local/julia /usr/local/aws-cli /usr/local/aws-sam-cli /usr/share/gradle"
-              rm_cmd: "rmz"
-              rmz_version: "3.1.1"
-
-         - uses: actions/setup-node@v4
-           with:
-              node-version: 'lts/*'
-
          -  uses: actions/checkout@master
 
+         # Avoid the following error when building multiple large images:
+         # `System.IO.IOException: No space left on device : '/home/runner/runners/2.319.1/_diag/Worker_20240826-130726-utc.log'`
+         # See also: https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+         -  name: Free Disk Space (Ubuntu)
+            uses: insightsengineering/disk-space-reclaimer@v1
+            with:
+               android: true
+               dotnet: true
+               haskell: true
+               large-packages: true
+               swap-storage: true
+               docker-images: false
          # See: https://stackoverflow.com/a/58178121
          -  name: Set Env
             run: |
@@ -87,24 +63,28 @@ jobs:
                # Strip "v" prefix from tag name
                [[ "${{ github.ref }}" == "refs/tags/"* ]] && IMAGE_VERSION=$(echo $IMAGE_VERSION | sed -e 's/^v//')
                echo "IMAGE_VERSION=$IMAGE_VERSION" >> $GITHUB_ENV
-
+         
                echo "IMAGE_ID=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
 
-         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio
-         -  name: Build Image
-            run: |
-               docker build -t $IMAGE_NAME .
+         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio     
+         -  name: Use QEMU
+            uses: docker/setup-qemu-action@master
+            with:
+             platforms: arm64,amd64
+      
+         - name: Set up Docker Buildx
+           id: buildx
+           uses: docker/setup-buildx-action@master
 
          -  name: Log In to Registry
             run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-         -  name: Push Image
-            run: |
-               echo IMAGE_ID=$IMAGE_ID
-               echo IMAGE_VERSION=$IMAGE_VERSION
-               docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
-               # Always tag latest when pushing a tag, as we don't expect to ever merge old tags
-               [[ "${{ github.ref }}" == "refs/tags/"* ]] && docker tag $IMAGE_NAME $IMAGE_ID:latest
-               docker push $IMAGE_ID:$IMAGE_VERSION
-               docker push $IMAGE_ID:latest
+         -  name: Build the docker image 
+            uses: docker/build-push-action@master
+            with:
+             context: .
+             builder: ${{ steps.buildx.outputs.name }}
+             platforms: linux/arm64,linux/amd64
+             push: true
+             tags: ghcr.io/${{ github.repository_owner }}/5etools-img:latest               
          # endregion

.gitignore

@@ -10,10 +10,9 @@ img
 .vscode/
 
 # Misc dev/scripting files
-trash/
-trash_in/
-node_/
-scratch/
+trash
+trash_in
+node_
 
 # Generated files
 sitemap.xml
@@ -27,6 +26,3 @@ sw-injector.js
 
 # Log files
 *.log
-
-# Dev scripts
-dev-*.sh