Skip to content

Commit fa6cc3d

Browse files
committed
Fixed: various build errors due to bit rot.
This attempts to minimise the amount of changes until everything seems to build at least.
1 parent 13f7cf6 commit fa6cc3d

File tree

5 files changed

+69
-62
lines changed

5 files changed

+69
-62
lines changed

.github/workflows/main.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ jobs:
1212
- name: Install Middleman and dependencies to build the site
1313
uses: ruby/[email protected]
1414
with:
15-
ruby-version: 2.3
15+
ruby-version: 2.6
1616
bundler-cache: true
17+
bundler: 1.17.3
1718
- run: bundle exec middleman build
1819

1920
- name: Init new repo in dist folder and commit generated files

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# The current stack is not compatible with Ruby 2.4 for similar reasons to this https://github.com/backup/backup/issues/820.
2-
FROM ruby:2.3
2+
FROM ruby:2.6.10
33

44
RUN mkdir /app
55
WORKDIR /app
@@ -9,8 +9,8 @@ RUN apt-get update && apt-get install -y \
99
unzip \
1010
&& rm -rf /var/lib/apt/lists/*
1111

12-
RUN gem install bundler
12+
RUN gem install bundler:1.17.3
1313

1414
COPY Gemfile* /app/
1515

16-
RUN bundle install
16+
RUN bundle _1.17.3_ install

Gemfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
source "https://rubygems.org"
22

3-
gem "middleman", "~>3.3.10"
4-
gem "middleman-deploy", "~>0.0.1"
3+
gem "haml", "~> 5.1.2"
4+
gem "padrino-helpers", "=0.12.4"
5+
gem "middleman", "=3.4.1"
56

67
gem "redcarpet"
7-
gem "rack-codehighlighter", :git => "https://github.com/wbzyl/rack-codehighlighter.git"
8-
gem "pygments.rb"
8+
gem "rack-codehighlighter", :git => "https://github.com/wbzyl/rack-codehighlighter.git", :ref => '64bf50520cb1d563432832ae30d85bbd94cec5bd'
9+
gem "pygments.rb", "~> 0.6.2"
910

1011
gem "middleman-blog"
1112
gem "builder"

Gemfile.lock

+57-52
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
GIT
22
remote: https://github.com/wbzyl/rack-codehighlighter.git
33
revision: 64bf50520cb1d563432832ae30d85bbd94cec5bd
4+
ref: 64bf50520cb1d563432832ae30d85bbd94cec5bd
45
specs:
56
rack-codehighlighter (0.5.0)
67
nokogiri (>= 1.4.1)
@@ -9,21 +10,24 @@ GIT
910
GEM
1011
remote: https://rubygems.org/
1112
specs:
12-
activesupport (4.1.16)
13-
i18n (~> 0.6, >= 0.6.9)
14-
json (~> 1.7, >= 1.7.7)
13+
activesupport (4.2.11.3)
14+
i18n (~> 0.7)
1515
minitest (~> 5.1)
16-
thread_safe (~> 0.1)
16+
thread_safe (~> 0.3, >= 0.3.4)
1717
tzinfo (~> 1.1)
18-
addressable (2.3.7)
19-
builder (3.2.2)
20-
celluloid (0.16.0)
21-
timers (~> 4.0.0)
22-
chunky_png (1.3.4)
23-
coffee-script (2.3.0)
18+
addressable (2.3.8)
19+
builder (3.2.4)
20+
capybara (2.4.4)
21+
mime-types (>= 1.16)
22+
nokogiri (>= 1.3.3)
23+
rack (>= 1.0.0)
24+
rack-test (>= 0.5.4)
25+
xpath (~> 2.0)
26+
chunky_png (1.4.0)
27+
coffee-script (2.4.1)
2428
coffee-script-source
2529
execjs
26-
coffee-script-source (1.9.1)
30+
coffee-script-source (1.12.2)
2731
compass (1.0.3)
2832
chunky_png (~> 1.2)
2933
compass-core (~> 1.0.2)
@@ -37,61 +41,59 @@ GEM
3741
compass-import-once (1.0.5)
3842
sass (>= 3.2, < 3.5)
3943
erubis (2.7.0)
40-
execjs (2.3.0)
41-
ffi (1.13.1)
44+
execjs (2.8.1)
45+
ffi (1.15.5)
4246
haml (5.1.2)
4347
temple (>= 0.8.0)
4448
tilt
4549
hike (1.2.3)
46-
hitimes (1.2.2)
47-
hooks (0.4.0)
48-
uber (~> 0.0.4)
50+
hooks (0.4.1)
51+
uber (~> 0.0.14)
4952
i18n (0.7.0)
50-
json (1.8.6)
51-
kramdown (1.6.0)
52-
listen (2.8.5)
53-
celluloid (>= 0.15.2)
54-
rb-fsevent (>= 0.9.3)
55-
rb-inotify (>= 0.9)
56-
middleman (3.3.10)
53+
json (2.6.2)
54+
kramdown (1.17.0)
55+
listen (3.0.8)
56+
rb-fsevent (~> 0.9, >= 0.9.4)
57+
rb-inotify (~> 0.9, >= 0.9.7)
58+
middleman (3.4.1)
5759
coffee-script (~> 2.2)
5860
compass (>= 1.0.0, < 2.0.0)
5961
compass-import-once (= 1.0.5)
6062
execjs (~> 2.0)
6163
haml (>= 4.0.5)
6264
kramdown (~> 1.2)
63-
middleman-core (= 3.3.10)
65+
middleman-core (= 3.4.1)
6466
middleman-sprockets (>= 3.1.2)
6567
sass (>= 3.4.0, < 4.0)
6668
uglifier (~> 2.5)
6769
middleman-blog (3.5.3)
6870
addressable (~> 2.3.5)
6971
middleman-core (~> 3.2)
7072
tzinfo (>= 0.3.0)
71-
middleman-core (3.3.10)
72-
activesupport (~> 4.1.0)
73+
middleman-core (3.4.1)
74+
activesupport (~> 4.1)
7375
bundler (~> 1.1)
76+
capybara (~> 2.4.4)
7477
erubis
7578
hooks (~> 0.3)
7679
i18n (~> 0.7.0)
77-
listen (>= 2.7.9, < 3.0)
80+
listen (~> 3.0.3)
7881
padrino-helpers (~> 0.12.3)
7982
rack (>= 1.4.5, < 2.0)
80-
rack-test (~> 0.6.2)
8183
thor (>= 0.15.2, < 2.0)
8284
tilt (~> 1.4.1, < 2.0)
83-
middleman-deploy (0.0.12)
84-
middleman-core (>= 3.0.0)
85-
ptools
86-
middleman-sprockets (3.4.2)
85+
middleman-sprockets (3.5.0)
8786
middleman-core (>= 3.3)
8887
sprockets (~> 2.12.1)
8988
sprockets-helpers (~> 1.1.0)
9089
sprockets-sass (~> 1.3.0)
90+
mime-types (3.4.1)
91+
mime-types-data (~> 3.2015)
92+
mime-types-data (3.2022.0105)
9193
mini_portile2 (2.8.0)
92-
minitest (5.14.1)
94+
minitest (5.16.3)
9395
multi_json (1.15.0)
94-
nokogiri (1.13.6)
96+
nokogiri (1.13.8)
9597
mini_portile2 (~> 2.8.0)
9698
racc (~> 1.4)
9799
padrino-helpers (0.12.4)
@@ -100,20 +102,19 @@ GEM
100102
tilt (~> 1.4.1)
101103
padrino-support (0.12.4)
102104
activesupport (>= 3.1)
103-
posix-spawn (0.3.10)
104-
ptools (1.3.2)
105-
pygments.rb (0.6.2)
105+
posix-spawn (0.3.15)
106+
pygments.rb (0.6.3)
106107
posix-spawn (~> 0.3.6)
107108
yajl-ruby (~> 1.2.0)
108109
racc (1.6.0)
109110
rack (1.6.13)
110-
rack-test (0.6.3)
111-
rack (>= 1.0)
112-
rb-fsevent (0.9.4)
113-
rb-inotify (0.9.5)
114-
ffi (>= 0.5.0)
111+
rack-test (2.0.2)
112+
rack (>= 1.3)
113+
rb-fsevent (0.11.2)
114+
rb-inotify (0.10.1)
115+
ffi (~> 1.0)
115116
redcarpet (3.5.1)
116-
sass (3.4.13)
117+
sass (3.4.25)
117118
sprockets (2.12.5)
118119
hike (~> 1.2)
119120
multi_json (~> 1.0)
@@ -125,27 +126,31 @@ GEM
125126
sprockets (~> 2.0)
126127
tilt (~> 1.1)
127128
temple (0.8.2)
128-
thor (0.19.1)
129+
thor (1.2.1)
129130
thread_safe (0.3.6)
130131
tilt (1.4.1)
131-
timers (4.0.1)
132-
hitimes
133132
tzinfo (1.2.10)
134133
thread_safe (~> 0.1)
135-
uber (0.0.13)
136-
uglifier (2.7.1)
134+
uber (0.0.15)
135+
uglifier (2.7.2)
137136
execjs (>= 0.3.0)
138137
json (>= 1.8.0)
139-
yajl-ruby (1.2.1)
138+
xpath (2.1.0)
139+
nokogiri (~> 1.3)
140+
yajl-ruby (1.2.3)
140141

141142
PLATFORMS
142143
ruby
143144

144145
DEPENDENCIES
145146
builder
146-
middleman (~> 3.3.10)
147+
haml (~> 5.1.2)
148+
middleman (= 3.4.1)
147149
middleman-blog
148-
middleman-deploy (~> 0.0.1)
149-
pygments.rb
150+
padrino-helpers (= 0.12.4)
151+
pygments.rb (~> 0.6.2)
150152
rack-codehighlighter!
151153
redcarpet
154+
155+
BUNDLED WITH
156+
1.17.3

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ You will need Docker.
99
#### Build the site
1010
```
1111
docker build -t middleman .
12-
docker run --rm --volume "$PWD":/app -t middleman bundle exec middleman build
12+
docker run --rm --volume "$PWD":/app -t middleman bundle _1.17.3_ exec middleman build
1313
```
1414

1515
#### Preview the site
1616

1717
```
18-
docker run --rm --publish 4567:4567 --volume "$PWD":/app -t middleman bundle exec middleman server
18+
docker run --rm --publish 4567:4567 --volume "$PWD":/app -t middleman bundle _1.17.3_ exec middleman server
1919
```
2020

2121
Open [http://localhost:4567/](http://localhost:4567/) to view the site. When you're done stop the Docker container with Ctrl-C.

0 commit comments

Comments
 (0)