Skip to content

Commit 607af30

Browse files
committed
Use a single workflow file
The `sass-embedded` cannot be installed when using the `jekyll/builder` Docker container
1 parent 9990330 commit 607af30

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

Diff for: .github/workflows/jekyll-docker.yml

-17
This file was deleted.

Diff for: .github/workflows/jekyll.yml

+11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
# Runs on pushes targeting the default branch
55
push:
66
branches: ["main"]
7+
# Runs on pull requests targeting the default branch
8+
pull_request:
9+
branches: [ "main" ]
710

811
# Allows us to run this workflow manually from the Actions tab
912
workflow_dispatch:
@@ -40,7 +43,13 @@ jobs:
4043
- name: Set up Pages
4144
id: pages
4245
uses: actions/configure-pages@v2
46+
- name: Build and test with Rake
47+
# Only run in pull requests
48+
if: github.event_name == 'pull_request'
49+
run: bundle exec rake
4350
- name: Build with Jekyll
51+
# Only run on pushes or manual runs
52+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4453
# Outputs to the './_site' directory by default
4554
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
4655
env:
@@ -51,6 +60,8 @@ jobs:
5160

5261
# Deployment job
5362
deploy:
63+
# Only run on pushes or manual runs
64+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
5465
environment:
5566
name: github-pages
5667
url: ${{ steps.deployment.outputs.page_url }}

0 commit comments

Comments
 (0)