Merge branch 'main' into update-version-in-package-json

Webperf-se · Nov 12, 2024 · 9c35824 · 9c35824
2 parents efa51b4 + fc9c65e
commit 9c35824
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/regression-test-email.yml b/.github/workflows/regression-test-email.yml
@@ -29,12 +29,14 @@ jobs:
     - name: Setup dependencies using pip
       run: pip install -r requirements.txt
     - if: ${{ matrix.os == 'ubuntu-latest' }}
+      continue-on-error: true
       shell: bash
       env:
         IP2LOCATION_DOWNLOAD_URL: ${{ secrets.IP2LOCATION_DOWNLOAD_URL }}
       name: Download IP2LOCATION DB (Using repository secret) - Linux
       run: wget -q -O data/IP2LOCATION-LITE-DB1.IPV6.BIN $IP2LOCATION_DOWNLOAD_URL
     - if: ${{ matrix.os == 'windows-latest' }}
+      continue-on-error: true
       shell: pwsh
       env:
         IP2LOCATION_DOWNLOAD_URL: ${{ secrets.IP2LOCATION_DOWNLOAD_URL }}

diff --git a/.github/workflows/regression-test-tracking.yml b/.github/workflows/regression-test-tracking.yml
@@ -38,45 +38,53 @@ jobs:
     - name: Setup dependencies using pip
       run: pip install -r requirements.txt
     - if: ${{ matrix.os == 'ubuntu-latest' }}
+      continue-on-error: true
       shell: bash
       env:
         IP2LOCATION_DOWNLOAD_URL: ${{ secrets.IP2LOCATION_DOWNLOAD_URL }}
       name: Download IP2LOCATION DB (Using repository secret) - Linux
       run: |
         wget -q -O data/IP2LOCATION-LITE-DB1.IPV6.BIN $IP2LOCATION_DOWNLOAD_URL
     - if: ${{ matrix.os == 'windows-latest' }}
+      continue-on-error: true
       shell: pwsh
       env:
         IP2LOCATION_DOWNLOAD_URL: ${{ secrets.IP2LOCATION_DOWNLOAD_URL }}
       name: Download IP2LOCATION DB (Using repository secret) - Windows
       run: |
         Invoke-WebRequest -Uri ${env:IP2LOCATION_DOWNLOAD_URL} -OutFile data\IP2LOCATION-LITE-DB1.IPV6.BIN
     - if: ${{ matrix.os == 'ubuntu-latest' }}
+      continue-on-error: true
       shell: bash
       name: Download Ads database (BlockListProject) - Linux
       run: |
         wget -q -O data/blocklistproject-ads-nl.txt https://blocklistproject.github.io/Lists/alt-version/ads-nl.txt
     - if: ${{ matrix.os == 'windows-latest' }}
+      continue-on-error: true
       shell: pwsh
       name: Download Ads database (BlockListProject) - Windows
       run: |
         Invoke-WebRequest -Uri https://blocklistproject.github.io/Lists/alt-version/ads-nl.txt -OutFile data\blocklistproject-ads-nl.txt
     - if: ${{ matrix.os == 'ubuntu-latest' }}
+      continue-on-error: true
       shell: bash
       name: Download Tracking database (BlockListProject) - Linux
       run: |
         wget -q -O data/blocklistproject-tracking-nl.txt https://blocklistproject.github.io/Lists/alt-version/tracking-nl.txt
     - if: ${{ matrix.os == 'windows-latest' }}
+      continue-on-error: true
       shell: pwsh
       name: Download Tracking database (BlockListProject) - Windows
       run: |
         Invoke-WebRequest -Uri https://blocklistproject.github.io/Lists/alt-version/tracking-nl.txt -OutFile data\blocklistproject-tracking-nl.txt
     - if: ${{ matrix.os == 'ubuntu-latest' }}
+      continue-on-error: true
       shell: bash
       name: Download Services database (disconnect) - Linux
       run: |
         wget -q -O data/disconnect-services.json https://raw.githubusercontent.com/disconnectme/disconnect-tracking-protection/master/services.json
     - if: ${{ matrix.os == 'windows-latest' }}
+      continue-on-error: true
       shell: pwsh
       name: Download Services database (disconnect) - Windows
       run: |
@@ -94,10 +102,6 @@ jobs:
         sudo apt-get update
         sudo apt-get --only-upgrade install google-chrome-stable
         google-chrome --version
-    - if: ${{ matrix.os == 'ubuntu-latest' }}
-      shell: bash
-      name: Setup GeckoDriver (Used for Selenium)
-      run: wget -q -O - https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz | tar -xvzf -
     - name: Setup npm packages
       run: npm install --omit=dev
     - if: ${{ matrix.os == 'ubuntu-latest' }}

diff --git a/helpers/credits_helper.py b/helpers/credits_helper.py
@@ -19,7 +19,7 @@ def update_credits_markdown(global_translation):
 
 
 def get_credits(global_translation):
-    text = '# Credits\r\n' # global_translation('TEXT_CREDITS')
+    text = '# Credits\r\n'
     text += 'Following shows projects and contributors for webperf-core and its dependencies.\r\n'
     text += 'Many thanks to all of you! :D\r\n'
 

diff --git a/locales/en/LC_MESSAGES/http_validator.mo b/locales/en/LC_MESSAGES/http_validator.mo
diff --git a/locales/en/LC_MESSAGES/http_validator.po b/locales/en/LC_MESSAGES/http_validator.po
@@ -204,5 +204,5 @@ msgstr "- {0}, Subresource Integrity (SRI) is required for following entries"
 msgid "TEXT_REVIEW_SRI_WITH_ERRORS"
 msgstr "- {0}, Subresource Integrity (SRI) is used incorrectly"
 
-msgid "TEXT_REVIEW_SRI_WITH_ERRORS"
+msgid "TEXT_REVIEW_SRI_WITH_ERRORS_DETAILS"
 msgstr "- {0}, Subresource Integrity (SRI) has following errors"
diff --git a/locales/gov/LC_MESSAGES/http_validator.mo b/locales/gov/LC_MESSAGES/http_validator.mo
diff --git a/locales/gov/LC_MESSAGES/http_validator.po b/locales/gov/LC_MESSAGES/http_validator.po
@@ -204,5 +204,5 @@ msgstr "- {0}, Subresource Integrity (SRI) is required for following entries"
 msgid "TEXT_REVIEW_SRI_WITH_ERRORS"
 msgstr "- {0}, Subresource Integrity (SRI) is used incorrectly"
 
-msgid "TEXT_REVIEW_SRI_WITH_ERRORS"
+msgid "TEXT_REVIEW_SRI_WITH_ERRORS_DETAILS"
 msgstr "- {0}, Subresource Integrity (SRI) has following errors"
diff --git a/locales/sv/LC_MESSAGES/http_validator.mo b/locales/sv/LC_MESSAGES/http_validator.mo
diff --git a/locales/sv/LC_MESSAGES/http_validator.po b/locales/sv/LC_MESSAGES/http_validator.po
@@ -204,5 +204,5 @@ msgstr "- {0}, Subresource Integrity (SRI) krävs för följande HTML-element"
 msgid "TEXT_REVIEW_SRI_WITH_ERRORS"
 msgstr "- {0}, Subresource Integrity (SRI) används på felaktigt sätt"
 
-msgid "TEXT_REVIEW_SRI_WITH_ERRORS"
+msgid "TEXT_REVIEW_SRI_WITH_ERRORS_DETAILS"
 msgstr "- {0}, Subresource Integrity (SRI) har följande fel"