Skip to content

Commit 7b4144a

Browse files
authored
Merge branch 'devopsdays:main' into main
2 parents 7c010a2 + 969f339 commit 7b4144a

5,103 files changed

Lines changed: 23552 additions & 13866 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
/config/ @devopsdays/code-reviewers
66
netlify.toml @devopsdays/build-infra
77
gulpfile.js @devopsdays/build-infra
8+
/gulp/ @devopsdays/build-infra
89
hugoserver.sh @devopsdays/build-infra
910
hugoserver.ps1 @devopsdays/build-infra
1011
package-lock.json @devopsdays/build-infra
1112
package.json @devopsdays/build-infra
1213
/data/core.toml @devopsdays/code-reviewers
14+
/archetypes/ @devopsdays/code-reviewers
1315
/utilities/ @devopsdays/code-reviewers
1416
/themes/devopsdays-theme/ @devopsdays/theme-maintainers
1517
/content/page/ @devopsdays/code-reviewers
16-
/.circleci/ @devopsdays/build-infra
18+
/.devcontainer/ @devopsdays/build-infra
1719
/bin/ @devopsdays/build-infra
1820
/.github/ @devopsdays/build-infra
1921
/static/robots.txt @devopsdays/build-infra
@@ -23,3 +25,5 @@ package.json @devopsdays/build-infra
2325
/data/events/ @devopsdays/content-reviewers
2426
/data/sponsors/ @devopsdays/content-reviewers
2527
/content/events/ @devopsdays/content-reviewers
28+
/static/events/ @devopsdays/content-reviewers
29+
/assets/ @devopsdays/content-reviewers

.github/workflows/hugo.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request]
44

55
env:
66
NODE_VERSION: 16
7-
HUGO_VERSION: 0.123.3
7+
HUGO_VERSION: 0.126.1
88

99
jobs:
1010
lint:
@@ -33,24 +33,13 @@ jobs:
3333
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
3434

3535
- name: Setup Hugo
36-
uses: peaceiris/actions-hugo@v2
36+
uses: peaceiris/actions-hugo@v3
3737
with:
3838
hugo-version: ${{ env.HUGO_VERSION }}
39-
# extended: true
39+
extended: true
4040

4141
- name: Build Hugo
42-
run: hugo -v
43-
44-
- uses: actions/setup-node@v3
45-
name: Setup Node
46-
with:
47-
node-version: ${{ env.NODE_VERSION }}
48-
49-
- run: npm ci
50-
name: Run npm ci
51-
52-
- name: Test through minifying
53-
run: gulp min-html
42+
run: hugo --environment=production --minify --templateMetrics --logLevel info
5443

5544
# test-windows:
5645
# needs: lint

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/public
2+
/resources/_gen
23
# General CodeKit files to ignore
34
config.codekit
45
# config.toml # This is a dangerous file, but we need it not in here.
@@ -84,3 +85,6 @@ hugo.log
8485

8586
# we don't use yarn
8687
yarn.lock
88+
89+
# hugo rendering folder
90+
resources/_gen/

.phlow

Lines changed: 0 additions & 7 deletions
This file was deleted.
235 KB

static/events/2019-chicago/organizers/albert-cheung.jpg renamed to assets/events/2019-chicago/organizers/albert-cheung.jpg

File renamed without changes.

static/events/2019-chicago/organizers/brian-devlin.jpg renamed to assets/events/2019-chicago/organizers/brian-devlin.jpg

File renamed without changes.

static/events/2019-chicago/organizers/christian-herro.jpg renamed to assets/events/2019-chicago/organizers/christian-herro.jpg

File renamed without changes.

static/events/2019-chicago/organizers/cora-hays-magan.jpg renamed to assets/events/2019-chicago/organizers/cora-hays-magan.jpg

File renamed without changes.

static/events/2019-chicago/organizers/default-male.jpg renamed to assets/events/2019-chicago/organizers/default-male.jpg

File renamed without changes.

0 commit comments

Comments
 (0)