Skip to content

Commit

Permalink
Upgrade to Middleman v4 (#111)
Browse files Browse the repository at this point in the history
- Upgrade to version 4 of Middleman.
- Simplify the site settings.
- Delete files not used since migration from Azure App Service.
  • Loading branch information
martincostello authored Feb 10, 2024
1 parent 61fa4de commit 80a8826
Show file tree
Hide file tree
Showing 51 changed files with 485 additions and 576 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.3

- name: Build blog
shell: pwsh
run: |
bundle config path vendor/bundle
bundle install
bundler config path vendor/bundle
bundler install
./build.ps1
- name: Publish blog
Expand Down
29 changes: 13 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
source 'https://rubygems.org'

gem "bundler", "~> 1.17.3"
gem "haml", "~> 5.2.2"
gem "middleman", "~> 3.4.1"
gem "middleman-blog", "~> 3.5.3"
gem "bundler", "~> 2.5.6"
gem "haml", "~> 6.3.0"
gem "middleman", "~> 4.5.1"
gem 'middleman-autoprefixer', '~> 3.0.0'
gem "middleman-blog", "~> 4.0.3"
gem "middleman-livereload", "~> 3.4.7"
gem "middleman-minify-html", "~> 3.4.1"
gem "middleman-syntax", "~> 3.3.0"
gem "middleman-syntax", "~> 3.4.0"
gem "nokogiri", "~> 1.16.2"
gem 'terser', '~> 1.2.0'

# For feed.xml.builder
gem "builder", "~> 3.0"
gem "builder", "~> 3.2.4"

# Live-reloading plugin
gem "middleman-livereload", "~> 3.4.6"

# Windows does not come with time zone data
gem "tzinfo-data"

# For faster file watcher updates on Windows:
gem 'wdm', '~> 0.1.0' if Gem.win_platform?
gem "tzinfo-data", "~> 1.2024.1", platforms: [:mswin, :mingw, :jruby, :x64_mingw]
gem 'wdm', '~> 0.1.1', platforms: [:mswin, :mingw, :x64_mingw]

gem "rack", "~> 2.2.8"
gem "redcarpet", "~> 3.6.0"

gem "rack", "~> 1.6.11"
228 changes: 109 additions & 119 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,166 +1,156 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
activesupport (7.0.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
autoprefixer-rails (10.4.16.0)
execjs (~> 2)
backports (3.24.1)
builder (3.2.4)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chunky_png (1.4.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.2.3)
contracts (0.16.1)
dotenv (2.8.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
erubis (2.7.0)
eventmachine (1.2.7)
execjs (2.8.1)
ffi (1.15.5)
haml (5.2.2)
temple (>= 0.8.0)
execjs (2.9.1)
fast_blank (1.0.1)
fastimage (2.3.0)
ffi (1.16.3)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
hike (1.2.3)
hooks (0.4.1)
uber (~> 0.0.14)
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.6.0)
htmlcompressor (0.2.0)
http_parser.rb (0.8.0)
i18n (0.7.0)
json (2.6.3)
kramdown (1.17.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
middleman (3.4.1)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
kramdown (2.4.0)
rexml
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
memoist (0.16.2)
middleman (4.5.1)
coffee-script (~> 2.2)
compass (>= 1.0.0, < 2.0.0)
compass-import-once (= 1.0.5)
execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-core (= 3.4.1)
middleman-sprockets (>= 3.1.2)
sass (>= 3.4.0, < 4.0)
uglifier (~> 2.5)
middleman-blog (3.5.3)
addressable (~> 2.3.5)
middleman-core (~> 3.2)
kramdown (>= 2.3.0)
middleman-cli (= 4.5.1)
middleman-core (= 4.5.1)
middleman-autoprefixer (3.0.0)
autoprefixer-rails (~> 10.0)
middleman-core (>= 4.0.0)
middleman-blog (4.0.3)
addressable (~> 2.3)
middleman-core (>= 4.0.0)
tzinfo (>= 0.3.0)
middleman-core (3.4.1)
activesupport (~> 4.1)
bundler (~> 1.1)
capybara (~> 2.4.4)
middleman-cli (4.5.1)
thor (>= 0.17.0, < 1.3.0)
middleman-core (4.5.1)
activesupport (>= 6.1, < 7.1)
addressable (~> 2.4)
backports (~> 3.6)
bundler (~> 2.0)
contracts (~> 0.13, < 0.17)
dotenv
erubis
hooks (~> 0.3)
i18n (~> 0.7.0)
listen (~> 3.0.3)
padrino-helpers (~> 0.12.3)
rack (>= 1.4.5, < 2.0)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
execjs (~> 2.0)
fast_blank
fastimage (~> 2.0)
hamster (~> 3.0)
hashie (~> 3.4)
i18n (~> 1.6.0)
listen (~> 3.0)
memoist (~> 0.14)
padrino-helpers (~> 0.15.0)
parallel
rack (>= 1.4.5, < 3)
sassc (~> 2.0)
servolux
tilt (~> 2.0.9)
toml
uglifier (~> 3.0)
webrick
middleman-livereload (3.4.7)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-minify-html (3.4.1)
htmlcompressor (~> 0.2.0)
middleman-core (>= 3.2)
middleman-sprockets (3.5.0)
middleman-core (>= 3.3)
sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.3.0)
middleman-syntax (3.3.0)
middleman-syntax (3.4.0)
middleman-core (>= 3.2)
rouge (~> 3.2)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mini_portile2 (2.8.2)
minitest (5.18.0)
multi_json (1.15.0)
nokogiri (1.15.0)
mini_portile2 (~> 2.8.2)
minitest (5.22.2)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
padrino-helpers (0.12.9)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.9)
padrino-helpers (0.15.3)
i18n (>= 0.6.7, < 2)
padrino-support (= 0.15.3)
tilt (>= 1.4.1, < 3)
padrino-support (0.12.9)
activesupport (>= 3.1)
racc (1.6.2)
rack (1.6.13)
padrino-support (0.15.3)
parallel (1.24.0)
parslet (2.0.0)
public_suffix (5.0.4)
racc (1.7.3)
rack (2.2.8)
rack-livereload (0.3.17)
rack
rack-test (2.1.0)
rack (>= 1.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.6.0)
rexml (3.2.6)
rouge (3.30.0)
sass (3.4.25)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
temple (0.10.1)
sassc (2.4.0)
ffi (~> 1.9)
servolux (0.13.0)
temple (0.10.3)
terser (1.2.0)
execjs (>= 0.3.0, < 3)
thor (1.2.2)
thread_safe (0.3.6)
tilt (1.4.1)
tzinfo (1.2.11)
thread_safe (~> 0.1)
tzinfo-data (1.2024.1)
tzinfo (>= 1.0.0)
uber (0.0.15)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
xpath (2.1.0)
nokogiri (~> 1.3)
tilt (2.0.11)
toml (0.3.0)
parslet (>= 1.8.0, < 3.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
webrick (1.8.1)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
builder (~> 3.0)
bundler (~> 1.17.3)
haml (~> 5.2.2)
middleman (~> 3.4.1)
middleman-blog (~> 3.5.3)
middleman-livereload (~> 3.4.6)
builder (~> 3.2.4)
bundler (~> 2.5.6)
haml (~> 6.3.0)
middleman (~> 4.5.1)
middleman-autoprefixer (~> 3.0.0)
middleman-blog (~> 4.0.3)
middleman-livereload (~> 3.4.7)
middleman-minify-html (~> 3.4.1)
middleman-syntax (~> 3.3.0)
rack (~> 1.6.11)
middleman-syntax (~> 3.4.0)
nokogiri (~> 1.16.2)
rack (~> 2.2.8)
redcarpet (~> 3.6.0)
tzinfo-data
terser (~> 1.2.0)
tzinfo-data (~> 1.2024.1)
wdm (~> 0.1.1)

BUNDLED WITH
1.17.3
2.5.6
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
git rev-parse HEAD > version.txt
git rev-parse --abbrev-ref HEAD > branch.txt

bundle exec middleman build
bundler exec middleman build

if ($LASTEXITCODE -ne 0) {
Write-Host "middleman build failed with exit code $LASTEXITCODE"
Expand Down
Loading

0 comments on commit 80a8826

Please sign in to comment.