Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/nokogiri-install-fail #27

Merged
merged 15 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,33 @@ on:

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
ruby-version: [2.7]

steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}

- uses: actions/cache@v1
with:
path: vendor/bundle
key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}

# necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache
# can remove once ruby 2.3 is no longer supported
- run: gem update --system 3.4.22

- run: bundle config set deployment 'true'
- run: bundle install

- run: bundle exec middleman build
-runs:
using: 'docker'
image: 'Dockerfile'
# runs-on: ubuntu-latest
#
# strategy:
# matrix:
# ruby-version: [ '2.7.0' ]
#
# steps:
# - uses: actions/checkout@v2
# - name: Set up Ruby
# uses: ruby/setup-ruby@v1
# with:
# ruby-version: ${{ matrix.ruby-version }}
#
# - uses: actions/cache@v1
# with:
# path: vendor/bundle
# key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
#
# # - run: gem update --system 3.4.22
# - run: sudo apt-get install -y --no-install-recommends build-essential
# - run: gem install bundler -v 2.4.22
#
# - run: bundle config set deployment 'true'
# - run: bundle config build.nokogiri --use-system-libraries
# - run: bundle install
#
# - run: bundle exec middleman build
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6-slim
FROM ruby:2.7-slim

WORKDIR /srv/slate

Expand All @@ -11,7 +11,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
build-essential \
nodejs \
&& gem install bundler \
&& gem install bundler -v 2.4.22\
&& bundle install \
&& apt-get remove -y build-essential \
&& apt-get autoremove -y \
Expand Down
1 change: 1 addition & 0 deletions lib/toc_data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ def toc_data(page_content)
end
headers
end

1 change: 0 additions & 1 deletion source/includes/_intro.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ We provide examples as:
- Javascript (web)
- Swift (iOS)
- Kotlin (Android)