Skip to content

Commit 3ec4a40

Browse files
authored
Merge pull request #74 from ruby/fixup-deploy
Fixup auto-deploy
2 parents f764b4a + 851c063 commit 3ec4a40

6 files changed

Lines changed: 74 additions & 70 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
persist-credentials: false
16-
- name: Build and Deploy
17-
uses: JamesIves/github-pages-deploy-action@releases/v3
16+
- uses: ruby/setup-ruby@v1
1817
with:
19-
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
20-
BRANCH: gh-pages
21-
FOLDER: build
18+
ruby-version: 2.6
19+
- name: Install dependencies
20+
run: bundle install
21+
- name: Build
22+
run: bundle exec middleman build
23+
- name: Deploy
24+
uses: peaceiris/actions-gh-pages@v3
25+
with:
26+
github_token: ${{ secrets.ACCESS_TOKEN }}
27+
publish_dir: ./build

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ gem "middleman-sprockets"
1010
gem "middleman-blog"
1111
gem 'middleman-gh-pages'
1212
gem "redcarpet"
13-
gem 'therubyracer', :platforms => :ruby
1413
gem 'haml', "~> 4.0.7"
14+
gem 'sass'

Gemfile.lock

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,62 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.0.7.1)
4+
activesupport (5.0.7.2)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
addressable (2.5.2)
10-
public_suffix (>= 2.0.2, < 4.0)
9+
addressable (2.7.0)
10+
public_suffix (>= 2.0.2, < 5.0)
1111
ast (2.4.0)
12-
backports (3.11.4)
12+
backports (3.17.0)
1313
coffee-script (2.4.1)
1414
coffee-script-source
1515
execjs
1616
coffee-script-source (1.12.2)
17-
compass-import-once (1.0.5)
18-
sass (>= 3.2, < 3.5)
19-
concurrent-ruby (1.1.3)
17+
concurrent-ruby (1.1.6)
2018
contracts (0.13.0)
21-
dotenv (2.5.0)
19+
dotenv (2.7.5)
2220
em-websocket (0.5.1)
2321
eventmachine (>= 0.12.9)
2422
http_parser.rb (~> 0.6.0)
2523
erubis (2.7.0)
2624
eventmachine (1.2.7)
2725
execjs (2.7.0)
2826
fast_blank (1.0.0)
29-
fastimage (2.1.5)
30-
ffi (1.9.25)
27+
fastimage (2.1.7)
28+
ffi (1.12.2)
3129
haml (4.0.7)
3230
tilt
3331
hamster (3.0.0)
3432
concurrent-ruby (~> 1.0)
3533
hashie (3.6.0)
3634
hike (1.2.3)
3735
http_parser.rb (0.6.0)
38-
i18n (0.7.0)
36+
i18n (0.9.5)
37+
concurrent-ruby (~> 1.0)
3938
kramdown (1.17.0)
40-
libv8 (3.16.14.19)
4139
listen (3.0.8)
4240
rb-fsevent (~> 0.9, >= 0.9.4)
4341
rb-inotify (~> 0.9, >= 0.9.7)
44-
memoist (0.16.0)
45-
middleman (4.2.1)
42+
memoist (0.16.2)
43+
middleman (4.3.6)
4644
coffee-script (~> 2.2)
47-
compass-import-once (= 1.0.5)
4845
haml (>= 4.0.5)
4946
kramdown (~> 1.2)
50-
middleman-cli (= 4.2.1)
51-
middleman-core (= 4.2.1)
52-
sass (>= 3.4.0, < 4.0)
53-
middleman-blog (4.0.2)
47+
middleman-cli (= 4.3.6)
48+
middleman-core (= 4.3.6)
49+
middleman-blog (4.0.3)
5450
addressable (~> 2.3)
55-
middleman-core (~> 4.0)
51+
middleman-core (>= 4.0.0)
5652
tzinfo (>= 0.3.0)
57-
middleman-cli (4.2.1)
53+
middleman-cli (4.3.6)
5854
thor (>= 0.17.0, < 2.0)
59-
middleman-core (4.2.1)
55+
middleman-core (4.3.6)
6056
activesupport (>= 4.2, < 5.1)
6157
addressable (~> 2.3)
6258
backports (~> 3.6)
63-
bundler (~> 1.1)
59+
bundler
6460
contracts (~> 0.13.0)
6561
dotenv
6662
erubis
@@ -69,17 +65,17 @@ GEM
6965
fastimage (~> 2.0)
7066
hamster (~> 3.0)
7167
hashie (~> 3.4)
72-
i18n (~> 0.7.0)
68+
i18n (~> 0.9.0)
7369
listen (~> 3.0.0)
7470
memoist (~> 0.14)
7571
padrino-helpers (~> 0.13.0)
7672
parallel
7773
rack (>= 1.4.5, < 3)
78-
sass (>= 3.4)
74+
sassc (~> 2.0)
7975
servolux
80-
tilt (~> 2.0)
76+
tilt (~> 2.0.9)
8177
uglifier (~> 3.0)
82-
middleman-gh-pages (0.4.0)
78+
middleman-gh-pages (0.4.1)
8379
rake (> 0.9.3)
8480
middleman-livereload (3.4.6)
8581
em-websocket (~> 0.5.1)
@@ -88,54 +84,56 @@ GEM
8884
middleman-sprockets (4.1.1)
8985
middleman-core (~> 4.0)
9086
sprockets (>= 3.0)
91-
middleman-syntax (3.0.0)
87+
middleman-syntax (3.2.0)
9288
middleman-core (>= 3.2)
93-
rouge (~> 2.0)
94-
minitest (5.11.3)
89+
rouge (~> 3.2)
90+
minitest (5.14.0)
9591
opal (0.11.4)
9692
ast (>= 2.3.0)
9793
hike (~> 1.2)
9894
parser (= 2.3.3.1)
9995
sourcemap (~> 0.1.0)
100-
opal-jquery (0.4.3)
101-
opal (>= 0.10.0, < 0.12.0)
102-
opal-sprockets (0.4.2.0.11.0.3.1)
96+
opal-jquery (0.4.4)
97+
opal (>= 0.10.0, < 1.1)
98+
opal-sprockets (0.4.3.0.11.0.3.7)
10399
opal (~> 0.11.0)
104-
sprockets (~> 3.1)
100+
sprockets (~> 3.7)
105101
tilt (>= 1.4)
106102
padrino-helpers (0.13.3.4)
107103
i18n (~> 0.6, >= 0.6.7)
108104
padrino-support (= 0.13.3.4)
109105
tilt (>= 1.4.1, < 3)
110106
padrino-support (0.13.3.4)
111107
activesupport (>= 3.1)
112-
parallel (1.12.1)
108+
parallel (1.19.1)
113109
parser (2.3.3.1)
114110
ast (~> 2.2)
115-
public_suffix (3.0.3)
116-
rack (2.0.8)
111+
public_suffix (4.0.3)
112+
rack (2.2.2)
117113
rack-livereload (0.3.17)
118114
rack
119115
rake (13.0.1)
120116
rb-fsevent (0.10.3)
121-
rb-inotify (0.9.10)
122-
ffi (>= 0.5.0, < 2)
123-
redcarpet (3.4.0)
124-
ref (2.0.0)
125-
rouge (2.2.1)
126-
sass (3.4.25)
117+
rb-inotify (0.10.1)
118+
ffi (~> 1.0)
119+
redcarpet (3.5.0)
120+
rouge (3.16.0)
121+
sass (3.7.4)
122+
sass-listen (~> 4.0.0)
123+
sass-listen (4.0.0)
124+
rb-fsevent (~> 0.9, >= 0.9.4)
125+
rb-inotify (~> 0.9, >= 0.9.7)
126+
sassc (2.2.1)
127+
ffi (~> 1.9)
127128
servolux (0.13.0)
128129
sourcemap (0.1.1)
129130
sprockets (3.7.2)
130131
concurrent-ruby (~> 1.0)
131132
rack (> 1, < 3)
132-
therubyracer (0.12.3)
133-
libv8 (~> 3.16.14.15)
134-
ref
135-
thor (0.20.3)
133+
thor (1.0.1)
136134
thread_safe (0.3.6)
137-
tilt (2.0.9)
138-
tzinfo (1.2.5)
135+
tilt (2.0.10)
136+
tzinfo (1.2.6)
139137
thread_safe (~> 0.1)
140138
uglifier (3.2.0)
141139
execjs (>= 0.3.0, < 3)
@@ -155,7 +153,7 @@ DEPENDENCIES
155153
opal-jquery
156154
opal-sprockets
157155
redcarpet
158-
therubyracer
156+
sass
159157

160158
BUNDLED WITH
161-
2.0.1
159+
2.1.4

0 commit comments

Comments
 (0)