diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 9bea8f57..47064fc6 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -4,7 +4,7 @@ name: ☁️ Build Container # Configures this workflow to run every time a change is pushed to the branch called `release`. on: push: - branches: ['main'] + branches: ["main"] release: types: [published] workflow_dispatch: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index addff401..ac4b2258 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,18 +34,20 @@ jobs: steps: - run: | - echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV + echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV" - if: inputs.config == 'build' run: | - echo "MKDOCS_INHERIT=mkdocs-production.yml" >> $GITHUB_ENV - echo "PRODUCTION=true" >> $GITHUB_ENV - echo "CONTEXT=${{ inputs.context }}" >> $GITHUB_ENV + { + echo "MKDOCS_INHERIT=mkdocs-production.yml" + echo "PRODUCTION=true" + echo "CONTEXT=${{ inputs.context }}" + } >> "$GITHUB_ENV" - if: inputs.config == 'offline' run: | - echo "MKDOCS_INHERIT=mkdocs-offline.yml" >> $GITHUB_ENV - echo "CARDS=false" >> $GITHUB_ENV + echo "MKDOCS_INHERIT=mkdocs-offline.yml" >> "$GITHUB_ENV" + echo "CARDS=false" >> "$GITHUB_ENV" - uses: actions/checkout@v4 with: @@ -76,6 +78,7 @@ jobs: cache: "pipenv" - uses: actions/cache/restore@v4.0.2 + id: site_cache_restore with: key: site-cache-${{ inputs.repo }}-${{ inputs.ref }}-${{ hashfiles('.cache/**') }} path: .cache @@ -84,6 +87,7 @@ jobs: site-cache-${{ inputs.repo }}- - uses: actions/cache/restore@v4.0.2 + id: card_cache_restore with: key: card-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}-${{ hashfiles('config/.cache/plugin/social/manifest.json') }} path: | @@ -110,11 +114,13 @@ jobs: tar -czvf site-${{ inputs.config }}-${{ inputs.lang }}.tar.gz site - uses: actions/cache/save@v4.0.2 + if: steps.site_cache_restore.outputs.cache-hit != 'true' with: key: site-cache-${{ inputs.repo }}-${{ inputs.ref }}-${{ hashfiles('.cache/**') }} path: .cache - uses: actions/cache/save@v4.0.2 + if: steps.card_cache_restore.outputs.cache-hit != 'true' with: key: card-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}-${{ hashfiles('config/.cache/plugin/social/manifest.json') }} path: | diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index da32ac79..512163c0 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -42,23 +42,19 @@ jobs: strategy: matrix: lang: [en, es, fr, he, it, nl, ru, zh-Hant] + build: [build, offline] fail-fast: false permissions: contents: read uses: ./.github/workflows/build.yml with: + config: ${{ matrix.build }} ref: ${{ github.ref }} repo: ${{ github.repository }} lang: ${{ matrix.lang }} continue-on-error: true - buildoffline: - needs: submodule - permissions: - contents: read - uses: ./.github/workflows/build-offline.yml - cleanup: if: ${{ always() }} - needs: [build, buildoffline] + needs: build uses: privacyguides/.github/.github/workflows/cleanup.yml@main diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml index 425359d2..5f6ed504 100644 --- a/.github/workflows/test-lint.yml +++ b/.github/workflows/test-lint.yml @@ -50,6 +50,56 @@ jobs: with: fetch-depth: 0 + - name: Configure markdown-link-check + run: | + cat <> .markdown-link-check.json + { + "ignorePatterns": [ + { + "pattern": "^https://twitter.com" + }, + { + "pattern": "^https://reddit.com" + }, + { + "pattern": "^#_" + }, + { + "pattern": ".onion" + }, + { + "pattern": "^https://en.opensuse.org" + }, + { + "pattern": "^https://quad9.net" + }, + { + "pattern": "^https://dnscrypt.info" + }, + { + "pattern": "^https://pipewire.org" + } + ], + "replacementPatterns": [ + { + "pattern": "^assets/", + "replacement": "https://www.privacyguides.org/en/assets/" + }, + { + "pattern": "^(../)*assets/", + "replacement": "https://www.privacyguides.org/en/assets/" + }, + { + "pattern": "^/", + "replacement": "https://www.privacyguides.org/" + } + ], + "retryOn429": true, + "retryCount": 5, + "aliveStatusCodes": [200, 206, 403] + } + EOT + - id: ml # You can override MegaLinter flavor used to have faster performances # More info at https://megalinter.io/flavors/ diff --git a/.vscode/settings.json b/.vscode/settings.json index a404cab7..c976c71a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -44,5 +44,8 @@ "tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji", "tag:yaml.org,2002:python/name:material.extensions.emoji.to_svg" ], - "editor.formatOnSave": true + "editor.formatOnSave": true, + "[github-actions-workflow]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } } diff --git a/docs/about/statistics.md b/docs/about/statistics.md index aebeeee3..9ddb79b3 100644 --- a/docs/about/statistics.md +++ b/docs/about/statistics.md @@ -1,7 +1,7 @@ --- title: Traffic Statistics --- - + We self-host [Umami](https://umami.is) to create a nice visualization of our traffic statistics, which are public at the link below. With this process: - Your information is never shared with a third-party, it stays on servers we control diff --git a/docs/cloud.md b/docs/cloud.md index fb0246b5..e5e30b7e 100644 --- a/docs/cloud.md +++ b/docs/cloud.md @@ -96,7 +96,7 @@ They have also received the Digital Trust Label, a certification from the [Swiss [:octicons-home-16: Homepage](https://peergos.org){ .md-button .md-button--primary } [:octicons-eye-16:](https://peergos.net/privacy.html){ .card-link title="Privacy Policy" } -[:octicons-info-16:](https://book.peergos.net){ .card-link title="Documentation" } +[:octicons-info-16:](https://book.peergos.org){ .card-link title="Documentation" } [:octicons-code-16:](https://github.com/Peergos/Peergos){ .card-link title="Source Code" }
diff --git a/docs/email-aliasing.md b/docs/email-aliasing.md index a6136a1e..fa5b36da 100644 --- a/docs/email-aliasing.md +++ b/docs/email-aliasing.md @@ -88,7 +88,7 @@ Notable free features: - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/firefox/addon/simplelogin) - [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn) - [:simple-microsoftedge: Edge](https://microsoftedge.microsoft.com/addons/detail/simpleloginreceive-sen/diacfpipniklenphgljfkmhinphjlfff) -- [:simple-safari: Safari](https://apps.apple.com/app/id1494051017) +- [:simple-safari: Safari](https://apps.apple.com/app/id6475835429)