From e7772c24f22dc993ac04ee7e1b68123689064200 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 6 Feb 2024 13:52:05 -0800 Subject: [PATCH] Update CI and rake tasks. --- .github/workflows/ci.yml | 12 +- Gemfile | 1 - Gemfile.lock | 342 +++++++++++++++++++++------------------ Rakefile | 2 +- 4 files changed, 188 insertions(+), 169 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8ed14d3..72a1a826 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,15 +16,15 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.2 - name: Install dependencies run: bundle install - - name: "Verify common files are consistent" - run: | - git remote add -f b https://github.com/w3c/json-ld-wg.git - git remote update - git diff --exit-code remotes/b/main -- common + #- name: "Verify common files are consistent" + # run: | + # git remote add -f b https://github.com/w3c/json-ld-wg.git + # git remote update + # git diff --exit-code remotes/b/main -- common - name: Verify examples are consistent run: bundle exec rake test diff --git a/Gemfile b/Gemfile index 8eba7cb6..3f7d31a2 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,6 @@ source "https://rubygems.org" gem 'json-ld', github: 'ruby-rdf/json-ld', branch: 'develop' gem 'json-ld-preloaded' gem 'nokogiri' -gem 'nokogumbo' gem 'linkeddata' gem 'colorize' gem 'rake' diff --git a/Gemfile.lock b/Gemfile.lock index 9927f211..245b51f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,193 +1,214 @@ GIT remote: https://github.com/ruby-rdf/json-ld.git - revision: 97d0daa4ff8f9497de683bd4cee902f9e5cf2131 + revision: fcd3aedd310aedbd61e6e1f1afa1b37d1ffebc2d branch: develop specs: - json-ld (3.1.9) + json-ld (3.3.1) htmlentities (~> 4.3) - json-canonicalization (~> 0.2) + json-canonicalization (~> 1.0) link_header (~> 0.0, >= 0.0.8) - multi_json (~> 1.14) - rack (~> 2.0) - rdf (~> 3.1) + multi_json (~> 1.15) + rack (>= 2.2, < 4) + rdf (~> 3.3) GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - amazing_print (1.3.0) - bcp47 (0.3.3) - i18n + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + bcp47_spec (0.2.1) builder (3.2.4) byebug (11.1.3) - colorize (0.8.1) - concurrent-ruby (1.1.9) - connection_pool (2.2.5) - ebnf (2.1.3) - amazing_print (~> 1.2) + colorize (1.1.0) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + ebnf (2.4.0) htmlentities (~> 4.3) - rdf (~> 3.1) + rdf (~> 3.3) scanf (~> 1.0) - sxp (~> 1.1) - unicode-types (~> 1.6) - equivalent-xml (0.6.0) - nokogiri (>= 1.4.3) - haml (5.2.2) - temple (>= 0.8.0) + sxp (~> 1.3) + unicode-types (~> 1.8) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt hamster (3.0.0) concurrent-ruby (~> 1.0) htmlentities (4.3.4) - i18n (1.8.10) - concurrent-ruby (~> 1.0) - json-canonicalization (0.2.1) - json-ld-preloaded (3.1.6) - json-ld (~> 3.1) - rdf (~> 3.1) - ld-patch (3.1.3) - ebnf (~> 2.1) - rdf (~> 3.1) - rdf-xsd (~> 3.1) - sparql (~> 3.1) - sxp (~> 1.1) + json-canonicalization (1.0.0) + json-ld-preloaded (3.3.0) + json-ld (~> 3.3) + rdf (~> 3.3) + ld-patch (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.3) link_header (0.0.8) - linkeddata (3.1.5) - equivalent-xml (~> 0.6) - json-ld (~> 3.1, >= 3.1.9) - json-ld-preloaded (~> 3.1, >= 3.1.5) - ld-patch (~> 3.1, >= 3.1.3) - nokogiri (~> 1.10) - nokogumbo (~> 2.0) - rdf (~> 3.1, >= 3.1.13) - rdf-aggregate-repo (~> 3.1) - rdf-isomorphic (~> 3.1, >= 3.1.1) - rdf-json (~> 3.1) - rdf-microdata (~> 3.1, >= 3.1.2) - rdf-n3 (~> 3.1, >= 3.1.2) - rdf-normalize (~> 0.4) - rdf-ordered-repo (~> 3.1, >= 3.1.1) - rdf-rdfa (~> 3.1, >= 3.1.3) - rdf-rdfxml (~> 3.1, >= 3.1.1) - rdf-reasoner (~> 0.7, >= 0.7.2) - rdf-tabular (~> 3.1, >= 3.1.1) - rdf-trig (~> 3.1, >= 3.1.2) - rdf-trix (~> 3.1) - rdf-turtle (~> 3.1, >= 3.1.3) - rdf-vocab (~> 3.1, >= 3.1.12) - rdf-xsd (~> 3.1) - shacl (~> 0.1, >= 0.1.1) - shex (~> 0.6, >= 0.6.1) - sparql (~> 3.1, >= 3.1.5) - sparql-client (~> 3.1, >= 3.1.2) + linkeddata (3.3.1) + json-ld (~> 3.3) + json-ld-preloaded (~> 3.3) + ld-patch (~> 3.3) + nokogiri (~> 1.15, >= 1.15.4) + rdf (~> 3.2, >= 3.2.1) + rdf-aggregate-repo (~> 3.2) + rdf-hamster-repo (~> 3.3) + rdf-isomorphic (~> 3.3) + rdf-json (~> 3.3) + rdf-microdata (~> 3.3) + rdf-n3 (~> 3.3) + rdf-normalize (~> 0.7) + rdf-ordered-repo (~> 3.3) + rdf-rdfa (~> 3.3) + rdf-rdfxml (~> 3.3) + rdf-reasoner (~> 0.9) + rdf-tabular (~> 3.3) + rdf-trig (~> 3.3) + rdf-trix (~> 3.3) + rdf-turtle (~> 3.3) + rdf-vocab (~> 3.3) + rdf-xsd (~> 3.3) + shacl (~> 0.4) + shex (~> 0.8) + sparql (~> 3.3) + sparql-client (~> 3.3) + yaml-ld (~> 0.0) + logger (1.6.0) + matrix (0.4.2) multi_json (1.15.0) - net-http-persistent (4.0.1) + net-http-persistent (4.0.2) connection_pool (~> 2.2) - nokogiri (1.14.3-x86_64-darwin) + nokogiri (1.16.2-aarch64-linux) racc (~> 1.4) - nokogiri (1.14.3-x86_64-linux) + nokogiri (1.16.2-arm-linux) racc (~> 1.4) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) - public_suffix (4.0.6) - racc (1.6.2) - rack (2.2.6.4) - rake (13.0.6) - rdf (3.1.15) - hamster (~> 3.0) + nokogiri (1.16.2-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.2-x86-linux) + racc (~> 1.4) + nokogiri (1.16.2-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.2-x86_64-linux) + racc (~> 1.4) + psych (5.1.2) + stringio + public_suffix (5.0.4) + racc (1.7.3) + rack (3.0.9) + rake (13.1.0) + rdf (3.3.1) + bcp47_spec (~> 0.2) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (3.1.0) - rdf (~> 3.1) - rdf-isomorphic (3.1.1) - rdf (~> 3.1) - rdf-json (3.1.0) - rdf (~> 3.1) - rdf-microdata (3.1.3) + rdf-aggregate-repo (3.3.0) + rdf (~> 3.3) + rdf-hamster-repo (3.3.0) + hamster (~> 3.0) + rdf (~> 3.3) + rdf-isomorphic (3.3.0) + rdf (~> 3.3) + rdf-json (3.3.0) + rdf (~> 3.3) + rdf-microdata (3.3.0) htmlentities (~> 4.3) - nokogiri (~> 1.10) - rdf (~> 3.1, >= 3.1.13) - rdf-rdfa (~> 3.1, >= 3.1.3) - rdf-xsd (~> 3.1) - rdf-n3 (3.1.2) - ebnf (~> 2.1) - rdf (~> 3.1, >= 3.1.8) - sparql (~> 3.1, >= 3.1.4) - sxp (~> 1.1) - rdf-normalize (0.4.0) - rdf (~> 3.1) - rdf-ordered-repo (3.1.1) - rdf (~> 3.1) - rdf-rdfa (3.1.3) - haml (~> 5.2) + nokogiri (~> 1.15, >= 1.15.4) + rdf (~> 3.3) + rdf-rdfa (~> 3.3) + rdf-xsd (~> 3.3) + rdf-n3 (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.3) + rdf-normalize (0.7.0) + rdf (~> 3.3) + rdf-ordered-repo (3.3.0) + rdf (~> 3.3) + rdf-rdfa (3.3.0) + haml (~> 6.1) htmlentities (~> 4.3) - rdf (~> 3.1, >= 3.1.13) - rdf-aggregate-repo (~> 3.1) - rdf-vocab (~> 3.1, >= 3.1.11) - rdf-xsd (~> 3.1) - rdf-rdfxml (3.1.1) + rdf (~> 3.3) + rdf-aggregate-repo (~> 3.3) + rdf-vocab (~> 3.3) + rdf-xsd (~> 3.3) + rdf-rdfxml (3.3.0) + builder (~> 3.2, >= 3.2.4) htmlentities (~> 4.3) - rdf (~> 3.1) - rdf-rdfa (~> 3.1) - rdf-xsd (~> 3.1) - rdf-reasoner (0.7.2) - rdf (~> 3.1, >= 3.1.12) - rdf-xsd (~> 3.1) - rdf-tabular (3.1.1) - addressable (~> 2.3) - bcp47 (~> 0.3, >= 0.3.3) - json-ld (~> 3.1) - rdf (~> 3.1) - rdf-vocab (~> 3.1) - rdf-xsd (~> 3.1) - rdf-trig (3.1.2) - ebnf (~> 2.1) - rdf (~> 3.1) - rdf-turtle (~> 3.1) - rdf-trix (3.1.1) - rdf (~> 3.1) - rdf-xsd (~> 3.1) - rdf-turtle (3.1.3) - ebnf (~> 2.1) - rdf (~> 3.1, >= 3.1.8) - rdf-vocab (3.1.14) - rdf (~> 3.1, >= 3.1.12) - rdf-xsd (3.1.1) - rdf (~> 3.1) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-reasoner (0.9.0) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-tabular (3.3.0) + addressable (~> 2.8) + bcp47_spec (~> 0.2) + json-ld (~> 3.3) + rdf (~> 3.3) + rdf-vocab (~> 3.3) + rdf-xsd (~> 3.3) + rdf-trig (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + rdf-turtle (~> 3.3) + rdf-trix (3.3.0) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-turtle (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + rdf-vocab (3.3.0) + rdf (~> 3.3) + rdf-xsd (3.3.0) + rdf (~> 3.3) rexml (~> 3.2) - rexml (3.2.5) + rexml (3.2.6) scanf (1.0.0) - shacl (0.1.1) - json-ld (~> 3.1, >= 3.1.7) - rdf (~> 3.1, >= 3.1.8) - sparql (~> 3.1) - sxp (~> 1.1) - shex (0.6.1) - ebnf (~> 2.0) - json-ld (~> 3.1) - json-ld-preloaded (~> 3.1) - rdf (~> 3.1) - rdf-xsd (~> 3.1) - sparql (~> 3.1) - sxp (~> 1.1) - sparql (3.1.7) - builder (~> 3.2) - ebnf (~> 2.1) - rdf (~> 3.1, >= 3.1.14) - rdf-aggregate-repo (~> 3.1) - rdf-xsd (~> 3.1) - sparql-client (~> 3.1, >= 3.1.2) - sxp (~> 1.1) - sparql-client (3.1.2) - net-http-persistent (~> 4.0, >= 4.0.1) - rdf (~> 3.1) - sxp (1.1.0) - rdf (~> 3.1) - temple (0.8.2) - tilt (2.0.10) - unicode-types (1.6.0) + shacl (0.4.1) + json-ld (~> 3.3) + rdf (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.2) + shex (0.8.0) + ebnf (~> 2.4) + htmlentities (~> 4.3) + json-ld (~> 3.3) + json-ld-preloaded (~> 3.3) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.3) + sparql (3.3.0) + builder (~> 3.2, >= 3.2.4) + ebnf (~> 2.4) + logger (~> 1.5) + rdf (~> 3.3) + rdf-aggregate-repo (~> 3.3) + rdf-xsd (~> 3.3) + sparql-client (~> 3.3) + sxp (~> 1.3) + sparql-client (3.3.0) + net-http-persistent (~> 4.0, >= 4.0.2) + rdf (~> 3.3) + stringio (3.1.0) + sxp (1.3.0) + matrix (~> 0.4) + rdf (~> 3.3) + temple (0.10.3) + thor (1.3.0) + tilt (2.3.0) + unicode-types (1.9.0) + yaml-ld (0.0.3) + json-ld (~> 3.3) + psych (>= 3.3) + rdf (~> 3.3) + rdf-xsd (~> 3.3) PLATFORMS - x86_64-darwin-20 + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES @@ -197,8 +218,7 @@ DEPENDENCIES json-ld-preloaded linkeddata nokogiri - nokogumbo rake BUNDLED WITH - 2.2.3 + 2.5.6 diff --git a/Rakefile b/Rakefile index 94d4d38e..5f3851f5 100644 --- a/Rakefile +++ b/Rakefile @@ -14,7 +14,7 @@ end desc "Check HTML" task :check_html do - require 'nokogumbo' + require 'nokogiri' doc = ::Nokogiri::HTML5(File.open("index.html"), max_parse_errors: 1000) unless doc.errors.empty? STDERR.puts "Errors found parsing index.html:"