Skip to content

Commit 822bd7f

Browse files
authored
Merge branch 'main' into kpotia-patch-1
2 parents 1195ea1 + e130fef commit 822bd7f

File tree

9 files changed

+379
-16
lines changed

9 files changed

+379
-16
lines changed

.devcontainer/devcontainer.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"name": "Jekyll website",
3+
"image": "mcr.microsoft.com/devcontainers/jekyll:latest",
4+
"features": {
5+
"ghcr.io/devcontainers/features/node:1": {
6+
"version": "22"
7+
},
8+
"ghcr.io/devcontainers/features/ruby:1": {
9+
"version": "3.3.5"
10+
}
11+
},
12+
"forwardPorts": [
13+
// Jekyll server
14+
4000,
15+
// Live reload server
16+
35729
17+
],
18+
"postCreateCommand": "bundle exec jekyll serve --incremental"
19+
}

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ updates:
44
directory: "/"
55
schedule:
66
interval: daily
7-
time: "10:00"
8-
timezone: Europe/Vienna
9-
pull-request-branch-name:
10-
separator: "-"
117
open-pull-requests-limit: 99
128
rebase-strategy: disabled
139
commit-message:

.github/workflows/jekyll-preview.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,23 @@ permissions:
1717
# Allow only one concurrent deployment per PR, skipping runs queued between the run in-progress and latest queued.
1818
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
1919
concurrency:
20-
group: 'pages-preview @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
20+
group: "pages-preview @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
2121
cancel-in-progress: false
2222
jobs:
2323
# Build job
2424
build:
25+
environment:
26+
name: "Pages Preview"
2527
# Limit permissions of the GITHUB_TOKEN for untrusted code
2628
permissions:
2729
contents: read
2830
runs-on: ubuntu-latest
2931
steps:
3032
- name: Checkout
31-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
33+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3234
with:
3335
# For PRs make sure to checkout the PR branch
34-
ref: ${{ github.event.pull_request.head.ref }}
36+
ref: ${{ github.event.pull_request.head.sha }}
3537
repository: ${{ github.event.pull_request.head.repo.full_name }}
3638
- name: Setup Pages
3739
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
@@ -46,7 +48,7 @@ jobs:
4648
# Deployment job
4749
deploy:
4850
environment:
49-
name: 'Pages Preview'
51+
name: "Pages Preview"
5052
url: ${{ steps.deployment.outputs.page_url }}
5153
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
5254
permissions:
@@ -60,4 +62,4 @@ jobs:
6062
id: deployment
6163
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
6264
with:
63-
preview: 'true'
65+
preview: "true"

.github/workflows/jekyll.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
30+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3131
- name: Setup Pages
3232
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
3333
- name: Build with Jekyll

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Set up Git repository
14-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
14+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1515
- name: Set up Ruby
16-
uses: ruby/setup-ruby@f26937343756480a8cb3ae1f623b9c8d89ed6984 # v1
16+
uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1
1717
with:
1818
bundler-cache: true
1919
- name: Set up Node
20-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
20+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
2121
- name: Bootstrap
2222
run: script/bootstrap
2323
env:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ bin
1010
css/main.scss
1111
test/node_modules
1212
test/package-lock.json
13-
Gemfile.lock

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2
1+
3.3.5

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "github-pages", group: :jekyll_plugins
3+
gem "github-pages", "~> 232", group: :jekyll_plugins
44

55
group :test do
66
gem "html-proofer"

0 commit comments

Comments
 (0)