feat!: Include ZIM files in releases (#3102)

.github/workflows/build-pr.yml

@@ -101,6 +101,16 @@ jobs:
       continue-on-error: true
       privileged: ${{ fromJSON(needs.metadata.outputs.privileged) }}
 
+  build_zimfile:
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'ci:build zimfile') }}
+    needs: [submodule, metadata]
+    uses: ./.github/workflows/build-zimfile.yml
+    with:
+      ref: ${{github.event.pull_request.head.ref}}
+      repo: ${{github.event.pull_request.head.repo.full_name}}
+    secrets:
+      RO_DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
+
   combine_build:
     needs: [build_english, build_i18n, build_blog]
     if: |
@@ -129,5 +139,5 @@ jobs:
 
   cleanup:
     if: ${{ always() }}
-    needs: [build_english, build_i18n, build_blog]
+    needs: [build_english, build_i18n, build_blog, build_zimfile]
     uses: privacyguides/.github/.github/workflows/cleanup.yml@main

.github/workflows/build-zimfile.yml

@@ -0,0 +1,603 @@
+name: 🥝 Build Zimfile
+
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: true
+        type: string
+      repo:
+        required: true
+        type: string
+    secrets:
+      RO_DISCOURSE_API_KEY:
+        required: false
+
+permissions:
+  contents: read
+
+env:
+  VIDEOS_SITE_BASE_URL: https://www.privacyguides.org/videos/
+  HOMEPAGE_CTA_ABOUT_LINK: about.html
+  HOMEPAGE_CTA_DONATE_LINK: about/donate.html
+  BUILD_OFFLINE: true
+  PRODUCTION: true
+  CARDS: false
+  GITREVISIONDATE: false
+  GITAUTHORS: false
+
+jobs:
+  package_eng:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    env:
+      LANGUAGE_SWITCHER: false
+      MAIN_SITE_BASE_URL: /en/index.html
+      MAIN_SITE_ABOUT_URL: /en/about.html
+      MAIN_SITE_RECOMMENDATIONS_URL: /en/tools.html
+      MAIN_SITE_KNOWLEDGE_BASE_URL: /en/basics/why-privacy-matters.html
+      ARTICLES_SITE_BASE_URL: /articles/index.html
+
+    steps:
+      - name: Add GitHub Token to Environment
+        run: |
+          echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV"
+
+      - name: Download Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repo }}
+          ref: ${{ inputs.ref }}
+          persist-credentials: "false"
+          fetch-depth: 0
+
+      - name: Download Submodules
+        uses: actions/download-artifact@v4
+        with:
+          pattern: repo-*
+          path: modules
+
+      - name: Move mkdocs-material-insiders to mkdocs-material
+        run: |
+          rmdir modules/mkdocs-material
+          mv modules/repo-mkdocs-material-insiders modules/mkdocs-material
+
+      - name: Move brand submodule to theme/assets/brand
+        run: |
+          rmdir theme/assets/brand
+          mv modules/repo-brand theme/assets/brand
+
+      - name: Install Python (pipenv)
+        uses: actions/setup-python@v5
+        with:
+          cache: "pipenv"
+
+      - name: Install Python Dependencies
+        run: |
+          pip install pipenv
+          pipenv install
+          sudo apt install pngquant
+
+      - name: Generate Donating Members List
+        continue-on-error: true
+        env:
+          DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
+        run: |
+          pip install requests
+          python tools/generate-members.py > includes/members.md
+
+      - name: Build English
+        run: |
+          ./run.sh --build --production --insiders --offline --lang=en
+
+      - name: Delete Unreferenced Assets
+        run: |
+          bash tools/delete-unreferenced.sh
+        env:
+          ASSETS_DIR: site/en/assets
+          SEARCH_DIR: site/en
+
+      - name: Run generate-topics.sh for top posts
+        run: |
+          bash tools/generate-topics.sh \
+            --source='https://discuss.privacyguides.net/top.json?period=weekly' \
+            --tag="top posts" \
+            --destination="./site/en/index.html" \
+            --count=3
+
+      - name: Run generate-topics.sh for latest posts
+        run: |
+          bash tools/generate-topics.sh \
+            --source='https://discuss.privacyguides.net/latest.json' \
+            --tag="latest posts" \
+            --destination="./site/en/index.html" \
+            --count=12
+
+      - name: Build Articles
+        run: |
+          pipenv run mkdocs build --config-file mkdocs.blog.yml
+
+      - name: Delete Unreferenced Assets
+        run: |
+          bash tools/delete-unreferenced.sh
+        env:
+          ASSETS_DIR: site/articles/assets
+          SEARCH_DIR: site/articles
+
+      - name: Remove Duplicate Files
+        run: |
+          cd site && bash ../tools/symlink-duplicates.sh
+          ln -s en/index.html index.html
+          ln -s en/about/notices.html license
+          cd ..
+
+      - name: Set zimfile name
+        run: |
+          echo "ZIMFILE_NAME=privacyguides.org_en_all_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
+
+      - name: Create ZIM File
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimwriterfs \
+              -w index.html \
+              -I en/assets/brand/logos/png/square/pg-yellow.png \
+              -l eng \
+              -t "Privacy Guides" \
+              -d "Your central privacy and security resource to protect yourself online." \
+              -c "Privacy Guides" \
+              -p "Privacy Guides" \
+              -e "https://www.privacyguides.org" \
+              -n "privacyguides.org_en_all" \
+              /data/site/ /data/${{ env.ZIMFILE_NAME }}
+
+      - name: Upload ZIM File
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.ZIMFILE_NAME }}
+          name: ${{ env.ZIMFILE_NAME }}
+          compression-level: 0
+
+      - name: Run zimcheck
+        uses: addnab/docker-run-action@v3
+        continue-on-error: true
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimcheck /data/${{ env.ZIMFILE_NAME }}
+
+  package_eng_kb:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    env:
+      LANGUAGE_SWITCHER: false
+      ARTICLES_SITE_BASE_URL: https://www.privacyguides.org/articles/
+
+    steps:
+      - name: Add GitHub Token to Environment
+        run: |
+          echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV"
+
+      - name: Download Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repo }}
+          ref: ${{ inputs.ref }}
+          persist-credentials: "false"
+          fetch-depth: 0
+
+      - name: Download Submodules
+        uses: actions/download-artifact@v4
+        with:
+          pattern: repo-*
+          path: modules
+
+      - name: Move mkdocs-material-insiders to mkdocs-material
+        run: |
+          rmdir modules/mkdocs-material
+          mv modules/repo-mkdocs-material-insiders modules/mkdocs-material
+
+      - name: Move brand submodule to theme/assets/brand
+        run: |
+          rmdir theme/assets/brand
+          mv modules/repo-brand theme/assets/brand
+
+      - name: Install Python (pipenv)
+        uses: actions/setup-python@v5
+        with:
+          cache: "pipenv"
+
+      - name: Install Python Dependencies
+        run: |
+          pip install pipenv
+          pipenv install
+          sudo apt install pngquant
+
+      - name: Generate Donating Members List
+        continue-on-error: true
+        env:
+          DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
+        run: |
+          pip install requests
+          python tools/generate-members.py > includes/members.md
+
+      - name: Build English
+        run: |
+          ./run.sh --build --production --insiders --offline --lang=en
+
+      - name: Run generate-topics.sh for top posts
+        run: |
+          bash tools/generate-topics.sh \
+            --source='https://discuss.privacyguides.net/top.json?period=weekly' \
+            --tag="top posts" \
+            --destination="./site/en/index.html" \
+            --count=3
+
+      - name: Run generate-topics.sh for latest posts
+        run: |
+          bash tools/generate-topics.sh \
+            --source='https://discuss.privacyguides.net/latest.json' \
+            --tag="latest posts" \
+            --destination="./site/en/index.html" \
+            --count=12
+
+      - name: Delete Unreferenced Assets
+        run: |
+          bash tools/delete-unreferenced.sh
+        env:
+          ASSETS_DIR: site/en/assets
+          SEARCH_DIR: site/en
+
+      - name: Remove Duplicate Files
+        run: |
+          cd site && bash ../tools/symlink-duplicates.sh
+          ln -s en/index.html index.html
+          ln -s en/about/notices.html license
+          cd ..
+
+      - name: Set zimfile name
+        run: |
+          echo "ZIMFILE_NAME=privacyguides.org_en_kb_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
+
+      - name: Create ZIM File
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimwriterfs \
+              -w index.html \
+              -I en/assets/brand/logos/png/square/pg-yellow.png \
+              -l eng \
+              -t "Privacy Guides" \
+              -d "Knowledge base articles and recommendations from Privacy Guides." \
+              -c "Privacy Guides" \
+              -p "Privacy Guides" \
+              -e "https://www.privacyguides.org" \
+              -n "privacyguides.org_en_kb" \
+              /data/site/ /data/${{ env.ZIMFILE_NAME }}
+
+      - name: Upload ZIM File
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.ZIMFILE_NAME }}
+          name: ${{ env.ZIMFILE_NAME }}
+          compression-level: 0
+
+      - name: Run zimcheck
+        uses: addnab/docker-run-action@v3
+        continue-on-error: true
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimcheck /data/${{ env.ZIMFILE_NAME }}
+
+  package_eng_articles:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    env:
+      MAIN_SITE_BASE_URL: https://www.privacyguides.org/en/
+      MAIN_SITE_ABOUT_URL: https://www.privacyguides.org/en/about/
+      MAIN_SITE_RECOMMENDATIONS_URL: https://www.privacyguides.org/en/tools/
+      MAIN_SITE_KNOWLEDGE_BASE_URL: https://www.privacyguides.org/en/basics/
+
+    steps:
+      - name: Add GitHub Token to Environment
+        run: |
+          echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV"
+
+      - name: Download Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repo }}
+          ref: ${{ inputs.ref }}
+          persist-credentials: "false"
+          fetch-depth: 0
+
+      - name: Download Submodules
+        uses: actions/download-artifact@v4
+        with:
+          pattern: repo-*
+          path: modules
+
+      - name: Move mkdocs-material-insiders to mkdocs-material
+        run: |
+          rmdir modules/mkdocs-material
+          mv modules/repo-mkdocs-material-insiders modules/mkdocs-material
+
+      - name: Move brand submodule to theme/assets/brand
+        run: |
+          rmdir theme/assets/brand
+          mv modules/repo-brand theme/assets/brand
+
+      - name: Install Python (pipenv)
+        uses: actions/setup-python@v5
+        with:
+          cache: "pipenv"
+
+      - name: Install Python Dependencies
+        run: |
+          pip install pipenv
+          pipenv install
+          sudo apt install pngquant
+
+      - name: Build Articles
+        run: |
+          pipenv run mkdocs build --config-file mkdocs.blog.yml
+
+      - name: Delete Unreferenced Assets
+        run: |
+          bash tools/delete-unreferenced.sh
+        env:
+          ASSETS_DIR: site/articles/assets
+          SEARCH_DIR: site/articles
+
+      - name: Remove Duplicate Files
+        run: |
+          cd site && bash ../tools/symlink-duplicates.sh
+          ln -s articles/index.html index.html
+          cd ..
+
+      - name: Set zimfile name
+        run: |
+          echo "ZIMFILE_NAME=privacyguides.org_en_articles_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
+
+      - name: Create ZIM File
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimwriterfs \
+              -w index.html \
+              -I articles/assets/brand/logos/png/square/pg-yellow.png \
+              -l eng \
+              -t "Privacy Guides" \
+              -d "Long-form articles from the Privacy Guides team and other contributors." \
+              -c "Privacy Guides" \
+              -p "Privacy Guides" \
+              -e "https://www.privacyguides.org" \
+              -n "privacyguides.org_en_articles" \
+              /data/site/ /data/${{ env.ZIMFILE_NAME }}
+
+      - name: Upload ZIM File
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.ZIMFILE_NAME }}
+          name: ${{ env.ZIMFILE_NAME }}
+          compression-level: 0
+
+      - name: Run zimcheck
+        uses: addnab/docker-run-action@v3
+        continue-on-error: true
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimcheck /data/${{ env.ZIMFILE_NAME }}
+
+  build_mul:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    permissions:
+      contents: read
+
+    env:
+      MAIN_SITE_BASE_URL: /en/index.html
+      MAIN_SITE_ABOUT_URL: /en/about.html
+      MAIN_SITE_RECOMMENDATIONS_URL: /en/tools.html
+      MAIN_SITE_KNOWLEDGE_BASE_URL: /en/basics/why-privacy-matters.html
+      ARTICLES_SITE_BASE_URL: /articles/index.html
+
+    strategy:
+      matrix:
+        lang: [en, es, fr, he, it, nl, ru, zh-Hant]
+
+    steps:
+      - name: Add GitHub Token to Environment
+        run: |
+          echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV"
+
+      - name: Download Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repo }}
+          ref: ${{ inputs.ref }}
+          persist-credentials: "false"
+          fetch-depth: 0
+
+      - name: Download Submodules
+        uses: actions/download-artifact@v4
+        with:
+          pattern: repo-*
+          path: modules
+
+      - name: Move mkdocs-material-insiders to mkdocs-material
+        run: |
+          rmdir modules/mkdocs-material
+          mv modules/repo-mkdocs-material-insiders modules/mkdocs-material
+
+      - name: Move brand submodule to theme/assets/brand
+        run: |
+          rmdir theme/assets/brand
+          mv modules/repo-brand theme/assets/brand
+
+      - name: Copy Translation Files
+        if: matrix.lang != 'en'
+        run: |
+          cp -rl modules/repo-i18n/i18n .
+          cp -rl modules/repo-i18n/includes .
+
+      - name: Install Python (pipenv)
+        uses: actions/setup-python@v5
+        with:
+          cache: "pipenv"
+
+      - name: Install Python Dependencies
+        run: |
+          pip install pipenv
+          pipenv install
+          sudo apt install pngquant
+
+      - name: Generate Donating Members List
+        continue-on-error: true
+        env:
+          DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
+        run: |
+          pip install requests
+          python tools/generate-members.py > includes/members.md
+
+      - name: Build Website
+        run: |
+          ./run.sh --build --production --insiders --offline --lang=${{ matrix.lang }}
+
+      - name: Run generate-topics.sh for top posts
+        if: matrix.lang == 'en'
+        run: |
+          bash tools/generate-topics.sh \
+            --source='https://discuss.privacyguides.net/top.json?period=weekly' \
+            --tag="top posts" \
+            --destination="./site/en/index.html" \
+            --count=3
+
+      - name: Run generate-topics.sh for latest posts
+        if: matrix.lang == 'en'
+        run: |
+          bash tools/generate-topics.sh \
+            --source='https://discuss.privacyguides.net/latest.json' \
+            --tag="latest posts" \
+            --destination="./site/en/index.html" \
+            --count=12
+
+      - name: Delete Unreferenced Assets
+        run: |
+          bash tools/delete-unreferenced.sh
+        env:
+          ASSETS_DIR: site/${{ matrix.lang }}/assets
+          SEARCH_DIR: site/${{ matrix.lang }}
+
+      - name: Build Articles
+        if: matrix.lang == 'en'
+        run: |
+          pipenv run mkdocs build --config-file mkdocs.blog.yml
+
+      - name: Delete Unreferenced Assets
+        if: matrix.lang == 'en'
+        run: |
+          bash tools/delete-unreferenced.sh
+        env:
+          ASSETS_DIR: site/articles/assets
+          SEARCH_DIR: site/articles
+
+      - name: Package Website
+        run: |
+          tar -czf site-zimready-${{ matrix.lang }}.tar.gz site
+
+      - name: Upload Site
+        uses: actions/upload-artifact@v4
+        with:
+          name: site-zimready-${{ matrix.lang }}.tar.gz
+          path: site-zimready-${{ matrix.lang }}.tar.gz
+          retention-days: 1
+          compression-level: 0
+
+  package_mul:
+    runs-on: ubuntu-latest
+    needs: [build_mul]
+    permissions:
+      contents: read
+
+    steps:
+      - name: Download Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repo }}
+          ref: ${{ inputs.ref }}
+          persist-credentials: "false"
+          fetch-depth: 0
+
+      - name: Download All Sites
+        uses: actions/download-artifact@v4
+        with:
+          pattern: site-zimready-*
+          merge-multiple: true
+
+      - name: List Files (for debugging)
+        run: |
+          for file in *.tar.gz; do tar -zxf "$file"; done
+          ls -la site/
+
+      - name: Remove Duplicate Files
+        run: |
+          cd site && bash ../tools/symlink-duplicates.sh
+          ln -s en/index.html index.html
+          ln -s en/about/notices.html license
+          cd ..
+
+      - name: Set zimfile name
+        run: |
+          echo "ZIMFILE_NAME=privacyguides.org_mul_all_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
+
+      - name: Create ZIM File
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimwriterfs \
+              -w index.html \
+              -I en/assets/brand/logos/png/square/pg-yellow.png \
+              -l mul \
+              -t "Privacy Guides" \
+              -d "Your central privacy and security resource to protect yourself online." \
+              -c "Privacy Guides" \
+              -p "Privacy Guides" \
+              -e "https://www.privacyguides.org" \
+              -n "privacyguides.org_mul_all" \
+              /data/site/ /data/${{ env.ZIMFILE_NAME }}
+
+      - name: Upload ZIM File
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.ZIMFILE_NAME }}
+          name: ${{ env.ZIMFILE_NAME }}
+          compression-level: 0
+
+      - name: Run zimcheck
+        uses: addnab/docker-run-action@v3
+        continue-on-error: true
+        with:
+          image: ghcr.io/openzim/zim-tools:3.1.3
+          options: -v ${{ github.workspace }}:/data
+          run: |
+            zimcheck /data/${{ env.ZIMFILE_NAME }}

.github/workflows/build.yml

@@ -180,7 +180,7 @@ jobs:
           DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
         run: |
           pip install requests
-          python generate-members.py > includes/members.md
+          python tools/generate-members.py > includes/members.md
 
       - name: Build Website
         run: |
@@ -189,7 +189,7 @@ jobs:
       - name: Run generate-topics.sh for top posts
         if: inputs.lang == 'en'
         run: |
-          bash generate-topics.sh \
+          bash tools/generate-topics.sh \
             --source='https://discuss.privacyguides.net/top.json?period=weekly' \
             --tag="top posts" \
             --destination="./site/en/index.html" \
@@ -198,7 +198,7 @@ jobs:
       - name: Run generate-topics.sh for latest posts
         if: inputs.lang == 'en'
         run: |
-          bash generate-topics.sh \
+          bash tools/generate-topics.sh \
             --source='https://discuss.privacyguides.net/latest.json' \
             --tag="latest posts" \
             --destination="./site/en/index.html" \
@@ -259,47 +259,3 @@ jobs:
           name: members.md
           path: includes/members.md
           retention-days: 1
-
-  offline_package:
-    if: inputs.config == 'offline' && inputs.lang == 'en'
-    needs: build
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ inputs.continue-on-error }}
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: site-offline-en.tar.gz
-
-      - run: |
-          tar -xzf site-offline-en.tar.gz
-          tar -czf offline.tar.gz site/en
-          zip -r -q offline.zip site/en
-
-      - name: Upload tar.gz file
-        uses: actions/upload-artifact@v4
-        with:
-          name: offline.tar.gz
-          path: offline.tar.gz
-
-      - name: Upload zip file
-        uses: actions/upload-artifact@v4
-        with:
-          name: offline.zip
-          path: offline.zip
-
-      - name: Create ZIM File
-        uses: addnab/docker-run-action@v3
-        with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
-          run: |
-            zimwriterfs -w index.html -I assets/brand/logos/png/square/pg-yellow.png -l eng -t "Privacy Guides" -d "Your central privacy and security resource to protect yourself online." -c "Privacy Guides" -p "Jonah Aragon" -n "Privacy Guides" -e "https://github.com/privacyguides/privacyguides.org" /data/site/en /data/offline-privacy_guides.zim
-
-      - name: Upload ZIM file
-        uses: actions/upload-artifact@v4
-        with:
-          name: offline-privacy_guides.zim
-          path: offline-privacy_guides.zim

.github/workflows/publish-release.yml

@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         lang: [en, es, fr, he, it, nl, ru, zh-Hant]
-        build: [build, offline]
+        build: [build]
     permissions:
       contents: read
     uses: ./.github/workflows/build.yml
@@ -77,9 +77,20 @@ jobs:
       continue-on-error: false
       context: production
 
+  build_zimfile:
+    needs: submodule
+    permissions:
+      contents: read
+    uses: ./.github/workflows/build-zimfile.yml
+    with:
+      repo: ${{ github.repository }}
+      ref: ${{ github.ref }}
+    secrets:
+      RO_DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
+
   release:
     name: Create release notes
-    needs: build
+    needs: [build, build_zimfile]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -87,14 +98,14 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          pattern: offline*
+          pattern: "*.zim"
           merge-multiple: true
 
       - name: Create release notes
         uses: ncipollo/release-action@v1
         with:
           generateReleaseNotes: true
-          artifacts: "offline.zip,offline.tar.gz,offline-privacy_guides.zim"
+          artifacts: "*.zim"
           makeLatest: true
 
   deploy:
@@ -115,5 +126,5 @@ jobs:
 
   cleanup:
     if: ${{ always() }}
-    needs: [build, build_blog]
+    needs: [build, build_blog, build_zimfile]
     uses: privacyguides/.github/.github/workflows/cleanup.yml@main

.github/workflows/update-discussions.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Run generate-topics.sh for top posts
         run: |
-          bash generate-topics.sh \
+          bash tools/generate-topics.sh \
             --source='https://discuss.privacyguides.net/top.json?period=weekly' \
             --tag="top posts" \
             --destination="./site/en/index.html" \
@@ -65,7 +65,7 @@ jobs:
 
       - name: Run generate-topics.sh for latest posts
         run: |
-          bash generate-topics.sh \
+          bash tools/generate-topics.sh \
             --source='https://discuss.privacyguides.net/latest.json' \
             --tag="latest posts" \
             --destination="./site/en/index.html" \