Skip to content

Commit f2d4998

Browse files
dnorhojdnorhoj
committed
:Merge branch 'slatedocs-main'
2 parents b29a4ea + 987c80e commit f2d4998

File tree

12 files changed

+335
-221
lines changed

12 files changed

+335
-221
lines changed

‎.dockerignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
1-
build/
1+
.git/
22
.github/
3+
build/
4+
.editorconfig
5+
.gitattributes
6+
.gitignore
7+
CHANGELOG.md
8+
CODE_OF_CONDUCT.md
9+
deploy.sh
10+
font-selection.json
11+
README.md
12+
Vagrantfile

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
ruby-version: [2.5, 2.6, 2.7, 3.0]
15+
ruby-version: [2.6, 2.7, '3.0', 3.1]
1616

1717
steps:
1818
- uses: actions/checkout@v2

‎.github/workflows/deploy.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ on:
66

77
jobs:
88
deploy:
9+
permissions:
10+
contents: write
11+
912
runs-on: ubuntu-latest
1013
env:
11-
ruby-version: 2.5
14+
ruby-version: 2.6
1215

1316
steps:
1417
- uses: actions/checkout@v2
@@ -20,9 +23,9 @@ jobs:
2023
- uses: actions/cache@v2
2124
with:
2225
path: vendor/bundle
23-
key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
26+
key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
2427
restore-keys: |
25-
gems-${{ runner.os }}-${{ matrix.ruby-version }}-
28+
gems-${{ runner.os }}-${{ env.ruby-version }}-
2629
gems-${{ runner.os }}-
2730
2831
- run: bundle config set deployment 'true'

‎.github/workflows/dev_deploy.yml

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,55 @@ on:
55
branches: [ 'dev' ]
66

77
jobs:
8-
deploy:
8+
push_to_registry:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Check out the repo
13+
uses: actions/checkout@v2
14+
15+
- name: Set up QEMU
16+
uses: docker/setup-qemu-action@v1
17+
with:
18+
platforms: all
19+
20+
- name: Docker meta
21+
id: meta
22+
uses: docker/metadata-action@v3
23+
with:
24+
images: |
25+
slatedocs/slate
26+
tags: |
27+
type=ref,event=branch
28+
29+
- name: Set up Docker Buildx
30+
id: buildx
31+
uses: docker/setup-buildx-action@v1
32+
33+
- name: Login to DockerHub
34+
uses: docker/login-action@v1
35+
with:
36+
username: ${{ secrets.DOCKER_USERNAME }}
37+
password: ${{ secrets.DOCKER_ACCESS_KEY }}
38+
39+
- name: Push to Docker Hub
40+
uses: docker/build-push-action@v2
41+
with:
42+
builder: ${{ steps.buildx.outputs.name }}
43+
context: .
44+
file: ./Dockerfile
45+
platforms: linux/amd64,linux/arm64,linux/ppc64le
46+
push: true
47+
tags: ${{ steps.meta.outputs.tags }}
48+
labels: ${{ steps.meta.outputs.labels }}
49+
50+
deploy_gh:
51+
permissions:
52+
contents: write
53+
954
runs-on: ubuntu-latest
1055
env:
11-
ruby-version: 2.5
56+
ruby-version: 2.6
1257

1358
steps:
1459
- uses: actions/checkout@v2
@@ -20,27 +65,17 @@ jobs:
2065
- uses: actions/cache@v2
2166
with:
2267
path: vendor/bundle
23-
key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
68+
key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
2469
restore-keys: |
25-
gems-${{ runner.os }}-${{ matrix.ruby-version }}-
70+
gems-${{ runner.os }}-${{ env.ruby-version }}-
2671
gems-${{ runner.os }}-
27-
2872
- run: bundle config set deployment 'true'
2973
- name: bundle install
3074
run: |
3175
bundle config path vendor/bundle
3276
bundle install --jobs 4 --retry 3
33-
3477
- run: bundle exec middleman build
3578

36-
- name: Push to Docker Hub
37-
uses: docker/build-push-action@v1
38-
with:
39-
username: ${{ secrets.DOCKER_USERNAME }}
40-
password: ${{ secrets.DOCKER_ACCESS_KEY }}
41-
repository: slatedocs/slate
42-
tag_with_ref: true
43-
4479
- name: Deploy
4580
uses: peaceiris/[email protected]
4681
with:

‎.github/workflows/publish.yml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,36 @@ jobs:
1212
- name: Check out the repo
1313
uses: actions/checkout@v2
1414

15-
- name: Push to Docker Hub
16-
uses: docker/build-push-action@v1
15+
- name: Set up QEMU
16+
uses: docker/setup-qemu-action@v1
17+
with:
18+
platforms: all
19+
20+
- name: Docker meta
21+
id: meta
22+
uses: docker/metadata-action@v3
23+
with:
24+
images: slatedocs/slate
25+
tags: |
26+
type=ref,event=tag
27+
28+
- name: Set up Docker Buildx
29+
id: buildx
30+
uses: docker/setup-buildx-action@v1
31+
32+
- name: Login to DockerHub
33+
uses: docker/login-action@v1
1734
with:
1835
username: ${{ secrets.DOCKER_USERNAME }}
1936
password: ${{ secrets.DOCKER_ACCESS_KEY }}
20-
repository: slatedocs/slate
21-
tag_with_ref: true
22-
tags: latest
37+
38+
- name: Push to Docker Hub
39+
uses: docker/build-push-action@v2
40+
with:
41+
builder: ${{ steps.buildx.outputs.name }}
42+
context: .
43+
file: ./Dockerfile
44+
platforms: linux/amd64,linux/arm64,linux/ppc64le
45+
push: true
46+
tags: ${{ steps.meta.outputs.tags }}
47+
labels: ${{ steps.meta.outputs.labels }}

‎CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,39 @@
11
# Changelog
22

3+
## Version 2.13.0
4+
5+
*April 22, 2022*
6+
7+
* __Drop support for ruby 2.5__
8+
* Bump rouge from 3.26.1 to 3.28.0
9+
* Formally support ruby 3.1
10+
* Bump nokogiri from 1.12.5 to 1.13.4
11+
* Build docker images for multiple architectures (e.g. `aarch64`)
12+
* Remove `VOLUME` declaration from Dockerfile (thanks @aemengo)
13+
14+
The security vulnerabilities reported against recent versions of nokogiri should not affect slate users with a regular setup.
15+
16+
## Version 2.12.0
17+
18+
*November 04, 2021*
19+
20+
* Bump nokogiri from 1.12.3 to 1.12.5
21+
* Bump ffi from 1.15.0 to 1.15.4
22+
* Bump rouge from 3.26.0 to 3.26.1
23+
* Bump middleman from 4.4.0 to 4.4.2
24+
* Remove unnecessary files from docker images
25+
26+
## Version 2.11.0
27+
28+
*August 12, 2021*
29+
30+
* __[Security]__ Bump addressable transitive dependency from 2.7.0 to 2.8.0
31+
* Support specifying custom meta tags in YAML front-matter
32+
* Bump nokogiri from 1.11.3 to 1.12.3 (minimum supported version is 1.11.4)
33+
* Bump middleman-autoprefixer from 2.10.1 to 3.0.0
34+
* Bump jquery from 3.5.1 to 3.6.0
35+
* Bump middleman from [`d180ca3`](https://github.com/middleman/middleman/commit/d180ca337202873f2601310c74ba2b6b4cf063ec) to 4.4.0
36+
337
## Version 2.10.0
438

539
*April 13, 2021*

‎Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ FROM ruby:2.6-slim
22

33
WORKDIR /srv/slate
44

5-
VOLUME /srv/slate/build
6-
VOLUME /srv/slate/source
7-
85
EXPOSE 4567
96

107
COPY Gemfile .

‎Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
ruby '>= 2.5'
1+
ruby '>= 2.6'
22
source 'https://rubygems.org'
33

44
# Middleman
5-
gem 'middleman', :github => 'middleman/middleman', :branch => '4.x'
5+
gem 'middleman', '~> 4.4'
66
gem 'middleman-syntax', '~> 3.2'
7-
gem 'middleman-autoprefixer', '~> 2.7'
7+
gem 'middleman-autoprefixer', '~> 3.0'
88
gem 'middleman-sprockets', '~> 4.1'
99
gem 'rouge', '~> 3.21'
1010
gem 'redcarpet', '~> 3.5.0'
11-
gem 'nokogiri', '~> 1.11.0'
11+
gem 'nokogiri', '~> 1.13.3'
1212
gem 'sass'
1313
gem 'webrick'

0 commit comments

Comments
 (0)