From 59dfea2aa3c788d2946d7d314b898437af1896f5 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Sun, 1 Jun 2025 18:42:26 +0000 Subject: [PATCH 1/6] Refine Ruby version handling and workflow clarity This commit introduces the following changes: - Removes comments from the HTMLProofer GitHub Actions workflow file for conciseness. - Adds a `.ruby-version` file specifying Ruby 3.0.0 for consistent Ruby versioning across environments. - Updates the GitHub Actions workflow (`ruby/setup-ruby` step) to automatically use the Ruby version defined in the `.ruby-version` file, removing the explicit version setting. These changes improve the clarity of the workflow and ensure consistent Ruby version management. --- .github/workflows/html-proofer.yml | 30 ++++++++++++++++++++++++++++++ .ruby-version | 1 + Gemfile | 1 + 3 files changed, 32 insertions(+) create mode 100644 .github/workflows/html-proofer.yml create mode 100644 .ruby-version diff --git a/.github/workflows/html-proofer.yml b/.github/workflows/html-proofer.yml new file mode 100644 index 0000000..53dd464 --- /dev/null +++ b/.github/workflows/html-proofer.yml @@ -0,0 +1,30 @@ +name: HTMLProofer + +on: + pull_request: + +jobs: + proof: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true # Runs bundle install and caches gems + + - name: Cache HTMLProofer results + uses: actions/cache@v3 + with: + path: tmp/.htmlproofer + key: ${{ runner.os }}-htmlproofer-${{ github.head_ref || github.run_id }} + restore-keys: | + ${{ runner.os }}-htmlproofer- + + - name: Build Jekyll site + run: bundle exec jekyll build + + - name: Run HTMLProofer + run: htmlproofer ./_site --allow-hash-href diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..4a36342 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.0.0 diff --git a/Gemfile b/Gemfile index cfb22cd..1c3b2e5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'https://rubygems.org' gem 'jekyll', '4.3.1' +gem 'html-proofer' group :jekyll_plugins do gem 'jekyll-archives' From 910dd9958227c6fc186111bad50cda38426c2bdd Mon Sep 17 00:00:00 2001 From: Menny Even Danan Date: Sun, 1 Jun 2025 19:55:12 -0400 Subject: [PATCH 2/6] gemfile lock update --- .ruby-version | 2 +- Gemfile | 4 ++++ Gemfile.lock | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4a36342..0aec50e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.0 +3.1.4 diff --git a/Gemfile b/Gemfile index 1c3b2e5..5968c52 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,10 @@ source 'https://rubygems.org' gem 'jekyll', '4.3.1' gem 'html-proofer' +gem 'csv' +gem 'logger' +gem 'base64' +gem 'bigdecimal' group :jekyll_plugins do gem 'jekyll-archives' diff --git a/Gemfile.lock b/Gemfile.lock index 01b8c71..6b4a099 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,15 +3,29 @@ GEM specs: addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) + base64 (0.3.0) + bigdecimal (3.2.1) colorator (1.1.0) concurrent-ruby (1.1.10) + csv (3.3.5) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) ffi (1.15.5) forwardable-extended (2.6.0) - google-protobuf (3.25.5) + google-protobuf (3.23.4) + html-proofer (4.4.3) + addressable (~> 2.3) + mercenary (~> 0.3) + nokogiri (~> 1.13) + parallel (~> 1.10) + rainbow (~> 3.0) + typhoeus (~> 1.3) + yell (~> 2.0) + zeitwerk (~> 2.5) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) @@ -52,36 +66,53 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) mercenary (0.4.0) + mini_portile2 (2.8.9) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + parallel (1.24.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (5.0.1) + racc (1.8.1) + rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.3.9) - rouge (4.0.1) + rouge (3.30.0) safe_yaml (1.0.5) sass-embedded (1.57.1) google-protobuf (~> 3.21) rake (>= 10.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) + typhoeus (1.4.1) + ethon (>= 0.9.0) unicode-display_width (2.3.0) webrick (1.8.2) + yell (2.2.2) + zeitwerk (2.6.18) PLATFORMS ruby DEPENDENCIES + base64 + bigdecimal + csv + html-proofer jekyll (= 4.3.1) jekyll-archives jekyll-feed jekyll-paginate jekyll-seo-tag jekyll-sitemap + logger webrick (~> 1.8) BUNDLED WITH - 2.4.1 + 2.6.9 From 4a61f2bb4105b3f56df966890653b433c60e9490 Mon Sep 17 00:00:00 2001 From: Menny Even Danan Date: Sun, 1 Jun 2025 21:36:38 -0400 Subject: [PATCH 3/6] Add a bunch of alt to images --- .github/workflows/html-proofer.yml | 2 +- download.html | 6 +++--- languages.html | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/html-proofer.yml b/.github/workflows/html-proofer.yml index 53dd464..ed09e4a 100644 --- a/.github/workflows/html-proofer.yml +++ b/.github/workflows/html-proofer.yml @@ -27,4 +27,4 @@ jobs: run: bundle exec jekyll build - name: Run HTMLProofer - run: htmlproofer ./_site --allow-hash-href + run: bundle exec htmlproofer ./_site --allow-hash-href diff --git a/download.html b/download.html index e872e4c..66e78f5 100644 --- a/download.html +++ b/download.html @@ -4,11 +4,11 @@ ---

You can download AnySoftKeyboard from Play Store or F-Droid.

- - + Play Store + F-Droid

Feeling adventurous? Sign up for the Beta channel here (Served via Google Play Store).

-

Feeling very adventurous? opt-in to the Alpha channel by also joining the Testers Google group.

+

Feeling very adventurous? opt-in to the Alpha channel by also joining the Testers Google group.

diff --git a/languages.html b/languages.html index 2402d16..742d8bd 100644 --- a/languages.html +++ b/languages.html @@ -11,19 +11,19 @@ {% if language.github == nil %} {% else %} - + {{ language.name }} on github {% endif %} {% if language.f-droid == nil %} {% else %} - + {{ language.name }} on f-droid {% endif %} {% if language.play == nil %} {% else %} - + {{ language.name }} on Google Play Store {% endif %}

From fa403aca32d1bf4ae35fae5b6af8d0a61da5d158 Mon Sep 17 00:00:00 2001 From: Menny Even Danan Date: Sun, 1 Jun 2025 21:42:02 -0400 Subject: [PATCH 4/6] Skip fdroid for now --- .github/workflows/html-proofer.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/html-proofer.yml b/.github/workflows/html-proofer.yml index ed09e4a..d8730f4 100644 --- a/.github/workflows/html-proofer.yml +++ b/.github/workflows/html-proofer.yml @@ -27,4 +27,6 @@ jobs: run: bundle exec jekyll build - name: Run HTMLProofer - run: bundle exec htmlproofer ./_site --allow-hash-href + run: bundle exec htmlproofer ./_site \ + --allow-hash-href \ + --ignore-urls "/f-droid.org/" From 97ebccc7e9843cd21c4d4001aba9f80c04ecb0eb Mon Sep 17 00:00:00 2001 From: Menny Even Danan Date: Sun, 1 Jun 2025 21:58:48 -0400 Subject: [PATCH 5/6] Skip fdroid if not valid --- .github/workflows/html-proofer.yml | 4 +--- languages.html | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/html-proofer.yml b/.github/workflows/html-proofer.yml index d8730f4..4383b81 100644 --- a/.github/workflows/html-proofer.yml +++ b/.github/workflows/html-proofer.yml @@ -27,6 +27,4 @@ jobs: run: bundle exec jekyll build - name: Run HTMLProofer - run: bundle exec htmlproofer ./_site \ - --allow-hash-href \ - --ignore-urls "/f-droid.org/" + run: bundle exec htmlproofer ./_site --allow-hash-href --ignore-urls "/f-droid.org/" diff --git a/languages.html b/languages.html index 742d8bd..199b907 100644 --- a/languages.html +++ b/languages.html @@ -8,19 +8,19 @@

{{ language.name }} flag {{ language.name }} - {% if language.github == nil %} + {% if language.github == nil or language.github == "" %} {% else %} {{ language.name }} on github {% endif %} - {% if language.f-droid == nil %} + {% if language.f-droid == nil or language.f-droid == "" %} {% else %} {{ language.name }} on f-droid {% endif %} - {% if language.play == nil %} + {% if language.play == ni or language.play == ""l %} {% else %} {{ language.name }} on Google Play Store From ac2dde214bda5d1a8690f9328ea8986f3b112d5c Mon Sep 17 00:00:00 2001 From: Menny Even Danan Date: Sun, 1 Jun 2025 23:18:17 -0400 Subject: [PATCH 6/6] for now don't worry about 404 errors --- .github/workflows/html-proofer.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/html-proofer.yml b/.github/workflows/html-proofer.yml index 4383b81..6cc0eae 100644 --- a/.github/workflows/html-proofer.yml +++ b/.github/workflows/html-proofer.yml @@ -1,4 +1,4 @@ -name: HTMLProofer +name: Checks on: pull_request: @@ -15,16 +15,8 @@ jobs: with: bundler-cache: true # Runs bundle install and caches gems - - name: Cache HTMLProofer results - uses: actions/cache@v3 - with: - path: tmp/.htmlproofer - key: ${{ runner.os }}-htmlproofer-${{ github.head_ref || github.run_id }} - restore-keys: | - ${{ runner.os }}-htmlproofer- - - name: Build Jekyll site run: bundle exec jekyll build - name: Run HTMLProofer - run: bundle exec htmlproofer ./_site --allow-hash-href --ignore-urls "/f-droid.org/" + run: bundle exec htmlproofer --allow-hash-href=true --ignore-status-codes=404 ./_site