Skip to content

Commit

Permalink
Update docker build workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
sylhare committed Aug 13, 2024
1 parent 4bea974 commit b30d191
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 42 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
name: Build Docker with theme
name: Build with Docker

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
image:

runs-on: ubuntu-latest
strategy:
matrix:
# The jekyll/builder is used by GitHub pages
docker-image: [ 'jekyll/builder', 'sylhare/jekyll' ]

steps:
- uses: actions/checkout@v4
- name: Set up Ruby
with:
ruby-version: '3.3'
uses: ruby/setup-ruby@v1
- name: Build with Docker
continue-on-error: true
run: |
cd assets && docker build .
- name: Build the site in the container
run: |
docker run \
-v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
${{ matrix.docker-image }}:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future"
- name: Pull docker images
continue-on-error: true
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gem-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [ master ]

jobs:
test:
ruby:

runs-on: ubuntu-latest
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gem-github-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [ master ]

jobs:
test:
ruby:

runs-on: ubuntu-latest
strategy:
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/jekyll-build.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/publish-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ jobs:
ruby-version: 3.1.0
- name: Install
run: bundle install
- name: Build jekyll site
run: bundle exec jekyll build
- name: Build the gem
continue-on-error: true
run: |
gem build *.gemspec
echo `find . -name "*.gem" | tail -1 | awk -F"[/]" '{print $2}'`
Expand Down

0 comments on commit b30d191

Please sign in to comment.