Skip to content

Commit

Permalink
Merge pull request #777 from github/update-theme-versions
Browse files Browse the repository at this point in the history
Upgrade all pages-themes to v0.2.0 (except primer, which is v0.6.0)
  • Loading branch information
parkr committed Jul 27, 2021
2 parents 6430a41 + bf8cae0 commit 5be1a6b
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
26 changes: 13 additions & 13 deletions lib/github-pages/plugins.rb
Expand Up @@ -54,19 +54,19 @@ class Plugins
# Themes to convert to remote themes
THEMES_TO_CONVERT_TO_REMOTE_THEMES = {
"jekyll-swiss" => "broccolini/swiss",
"jekyll-theme-primer" => "pages-themes/primer@v0.5.4",
"jekyll-theme-architect" => "pages-themes/architect@v0.1.1",
"jekyll-theme-cayman" => "pages-themes/cayman@v0.1.1",
"jekyll-theme-dinky" => "pages-themes/dinky@v0.1.1",
"jekyll-theme-hacker" => "pages-themes/hacker@v0.1.1",
"jekyll-theme-leap-day" => "pages-themes/leap-day@v0.1.1",
"jekyll-theme-merlot" => "pages-themes/merlot@v0.1.1",
"jekyll-theme-midnight" => "pages-themes/midnight@v0.1.1",
"jekyll-theme-minimal" => "pages-themes/minimal@v0.1.1",
"jekyll-theme-modernist" => "pages-themes/modernist@v0.1.1",
"jekyll-theme-slate" => "pages-themes/slate@v0.1.1",
"jekyll-theme-tactile" => "pages-themes/tactile@v0.1.1",
"jekyll-theme-time-machine" => "pages-themes/time-machine@v0.1.1",
"jekyll-theme-primer" => "pages-themes/primer@v0.6.0",
"jekyll-theme-architect" => "pages-themes/architect@v0.2.0",
"jekyll-theme-cayman" => "pages-themes/cayman@v0.2.0",
"jekyll-theme-dinky" => "pages-themes/dinky@v0.2.0",
"jekyll-theme-hacker" => "pages-themes/hacker@v0.2.0",
"jekyll-theme-leap-day" => "pages-themes/leap-day@v0.2.0",
"jekyll-theme-merlot" => "pages-themes/merlot@v0.2.0",
"jekyll-theme-midnight" => "pages-themes/midnight@v0.2.0",
"jekyll-theme-minimal" => "pages-themes/minimal@v0.2.0",
"jekyll-theme-modernist" => "pages-themes/modernist@v0.2.0",
"jekyll-theme-slate" => "pages-themes/slate@v0.2.0",
"jekyll-theme-tactile" => "pages-themes/tactile@v0.2.0",
"jekyll-theme-time-machine" => "pages-themes/time-machine@v0.2.0",
}
end
end
6 changes: 3 additions & 3 deletions spec/github-pages/configuration_spec.rb
Expand Up @@ -20,7 +20,7 @@
ENV.delete("DISABLE_WHITELIST")
ENV["JEKYLL_ENV"] = "test"
ENV["PAGES_REPO_NWO"] = "github/pages-gem"
stub_request_for_remote_theme(:repo => "pages-themes/primer", :revision => "v0.5.4", :filename => "primer-0.5.4.zip")
stub_request_for_remote_theme(:repo => "pages-themes/primer", :revision => "v0.6.0", :filename => "primer-0.6.0.zip")
end

context "#effective_config" do
Expand Down Expand Up @@ -121,7 +121,7 @@
end

before(:each) do
stub_request_for_remote_theme(:repo => "pages-themes/merlot", :revision => "v0.1.1", :filename => "merlot-0.1.1.zip")
stub_request_for_remote_theme(:repo => "pages-themes/merlot", :revision => "v0.2.0", :filename => "merlot-0.2.0.zip")
end

it "respects the theme" do
Expand Down Expand Up @@ -156,7 +156,7 @@
end

it "plugins include jekyll remote theme" do
stub_request_for_remote_theme(:repo => "foo/bar", :revision => "HEAD", :filename => "primer-0.5.4.zip")
stub_request_for_remote_theme(:repo => "foo/bar", :revision => "HEAD", :filename => "primer-0.6.0.zip")
expect(effective_config["plugins"]).to include("jekyll-remote-theme")
end
end
Expand Down
Binary file not shown.
Binary file removed spec/support/primer-0.5.4.zip
Binary file not shown.
Binary file added spec/support/primer-0.6.0.zip
Binary file not shown.

0 comments on commit 5be1a6b

Please sign in to comment.