Skip to content

Commit f20f412

Browse files
authored
Merge pull request #104 from lumag/trunk
github: update workflows
2 parents a975022 + f7a8d1a commit f20f412

File tree

2 files changed

+20
-52
lines changed

2 files changed

+20
-52
lines changed
Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
2-
name: Deploy Jekyll / GitHub Pages
2+
name: Deploy Jekyll site to Pages
33

44
on:
55
# Runs on pushes targeting the default branch
@@ -11,7 +11,7 @@ on:
1111

1212
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
1313
permissions:
14-
contents: write
14+
contents: read
1515
pages: write
1616
id-token: write
1717

@@ -37,12 +37,25 @@ jobs:
3737
- name: Regenerate templates
3838
run: ./regen.py
3939
- name: Setup Pages
40+
id: pages
4041
uses: actions/configure-pages@v5
4142
- name: Build with Jekyll
42-
run: bundle exec jekyll build
43+
# Outputs to the './_site' directory by default
44+
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
45+
env:
46+
JEKYLL_ENV: production
4347
- name: Upload artifact
48+
# Automatically uploads an artifact from the './_site' directory by default
4449
uses: actions/upload-pages-artifact@v3
45-
- name: deploy
46-
uses: JamesIves/github-pages-deploy-action@v4
47-
with:
48-
folder: _site
50+
51+
# Deployment job
52+
deploy:
53+
environment:
54+
name: github-pages
55+
url: ${{ steps.deployment.outputs.page_url }}
56+
runs-on: ubuntu-latest
57+
needs: build
58+
steps:
59+
- name: Deploy to GitHub Pages
60+
id: deployment
61+
uses: actions/deploy-pages@v4

.github/workflows/premerge.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)