From a4d61437065251d118c6750a8f310a4ffabff4a4 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:17:44 -0700 Subject: [PATCH 1/5] CI: checkout submodules --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dc1b872..36fa223 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + submodules: true - name: Set up Ruby uses: ruby/setup-ruby@v1 From 2324b41306ac252fcec92decd501500e470b0c79 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:22:05 -0700 Subject: [PATCH 2/5] Update ODbL title Caught by CI, following https://github.com/spdx/license-list-XML/pull/1181 --- _licenses/odbl-1.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/odbl-1.0.txt b/_licenses/odbl-1.0.txt index c960056..161ed96 100644 --- a/_licenses/odbl-1.0.txt +++ b/_licenses/odbl-1.0.txt @@ -1,5 +1,5 @@ --- -title: ODC Open Database License v1.0 +title: Open Data Commons Open Database License v1.0 spdx-id: ODbL-1.0 nickname: ODbL From 9a138e1ef387f4336f4eabe42c99b9db9e67d42d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:25:41 -0700 Subject: [PATCH 3/5] Update CC-BY-4.0 example use WHATWG moved to a concatenated CC-BY-4.0 and BSD-3-Clause LICENSE file --- _licenses/cc-by-4.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index baa5c9f..176bb69 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -8,7 +8,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: caniuse: https://github.com/Fyrd/caniuse/blob/master/LICENSE - WHATWG HTML standard: https://github.com/whatwg/html/blob/master/LICENSE + FiveThirtyEight data: https://github.com/fivethirtyeight/data/blob/master/LICENSE Kubernetes documentation: https://github.com/kubernetes/website/blob/master/LICENSE permissions: From 07e3e9521f075ebd0d037bfc0f007a3d0324d872 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:30:10 -0700 Subject: [PATCH 4/5] rubocop fixes --- spec/spec_helper.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 00285b8..9f27e58 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -33,11 +33,9 @@ def config end def licenses - SpecHelper.licenses ||= begin - site.collections['licenses'].docs.map do |license| - spdx_lcase = File.basename(license.basename, '.txt') - license.to_liquid.merge('spdx-lcase' => spdx_lcase) - end + SpecHelper.licenses ||= site.collections['licenses'].docs.map do |license| + spdx_lcase = File.basename(license.basename, '.txt') + license.to_liquid.merge('spdx-lcase' => spdx_lcase) end end @@ -139,6 +137,7 @@ module Licensee dir = ::File.dirname(__FILE__) ::File.expand_path '../_licenses', dir end + def spdx_dir ::File.expand_path '../license-list-XML/src', __dir__ end From af860ab6426d8ada854d20dfefbe6741e88167b4 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:32:31 -0700 Subject: [PATCH 5/5] rubocop: indent --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9f27e58..94a1655 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -34,8 +34,8 @@ end def licenses SpecHelper.licenses ||= site.collections['licenses'].docs.map do |license| - spdx_lcase = File.basename(license.basename, '.txt') - license.to_liquid.merge('spdx-lcase' => spdx_lcase) + spdx_lcase = File.basename(license.basename, '.txt') + license.to_liquid.merge('spdx-lcase' => spdx_lcase) end end