Skip to content

Commit

Permalink
Merge pull request #16 from devopsdays/main
Browse files Browse the repository at this point in the history
Merge from core
  • Loading branch information
mkoperator committed Nov 4, 2022
2 parents 7d3e6e0 + 2016f4b commit 8722a80
Show file tree
Hide file tree
Showing 4,706 changed files with 21,222 additions and 7,676 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
91 changes: 0 additions & 91 deletions .circleci/config.yml

This file was deleted.

63 changes: 53 additions & 10 deletions .github/workflows/hugo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,71 @@ name: test hugo

on: [pull_request]

env:
NODE_VERSION: 16
HUGO_VERSION: 0.102.3

jobs:
test:
runs-on: ubuntu-18.04
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Lint Filenames
uses: julie-ng/lowercase-linter@v1
id: lint_filenames
continue-on-error: false
with:
path: "."
pr-comment: true
repo-token: ${{ secrets.GITHUB_TOKEN }}
test-linux:
needs: lint
name: Build hugo on Linux
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true # Fetch Hugo themes (true OR recursive)
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
submodules: true # Fetch Hugo themes (true OR recursive)
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: '0.81.0'
hugo-version: ${{ env.HUGO_VERSION }}
# extended: true

- name: Build
- name: Build Hugo
run: hugo -v

- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
name: Setup Node
with:
node-version: 12
node-version: ${{ env.NODE_VERSION }}

- run: npm ci
name: Run npm ci

- name: Test
- name: Test through minifying
run: gulp min-html

test-windows:
needs: lint
name: Build hugo on Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true # Fetch Hugo themes (true OR recursive)
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: ${{ env.HUGO_VERSION }}
# extended: true

- name: Build
run: hugo -v
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ If you'd like to edit a specific devopsdays event site (and/or contribute code),

### Quick Overview

1. Install [Hugo](http://gohugo.io). Use the Hugo version that we use in [.circleci/config.yml](https://github.com/devopsdays/devopsdays-web/blob/main/.circleci/config.yml) file. [(Quick Install)](https://gohugo.io/getting-started/installing#binary-cross-platform)
1. Install [Hugo](http://gohugo.io). Use the Hugo version that we use in [.github/workflows/hugo.yml](https://github.com/devopsdays/devopsdays-web/blob/main/.github/workflows/hugo.yml) file. [(Quick Install)](https://gohugo.io/getting-started/installing#binary-cross-platform)
Examples of hugo installation with a version:
- maxOS: `brew install [email protected]`
- linux: `brew install [email protected]`
Expand Down Expand Up @@ -133,8 +133,7 @@ If you have permissions to merge PRs on this repo, here are a few guidelines to

The following tests run when a PR is submitted:

1. [CircleCI](https://circleci.com/gh/devopsdays/devopsdays-web) - this test confirms that the site can be built with Hugo on linux, and it runs an `html-min` gulp task which will identify if there is any invalid HTML in the site. This protects the final build, so if the CircleCI build or test jobs fail, please take a look as to why they failed.
1. [Appveyor](https://ci.appveyor.com/project/DevOpsDays/devopsdays-web) - this test builds Hugo on Windows, to ensure that no Windows-incompatible files have been included. If Appveyor tests fail, merge at your own discretion, based upon the failure reason.
1. [GitHub Actions](https://github.com/devopsdays/devopsdays-web/actions) - a set of tests that confirm that all files are lowercase (in order to be friendly among all platforms people may use), that the site can be built with Hugo on Linux (ubuntu-latest) and Windows (windows-latest). There is also a test in which gulp will run html-min in order to identity if there is any invalid HTML. All three jobs (lint, build on Linux, and build on Windows) are required in order to deploy with Netlify -- regardless if the Netlify test passed or not.
1. [Netlify](https://app.netlify.com/sites/devopsdays-web) - this test builds the site, and hosts an ephemeral preview version of it (viewable by clicking on the "details" link next to the test once it has turned green). It's a good idea to view this "deploy preview" if the PR has changed anything significant (adding a sponsor, etc, probably not...but changing content in a large way? Yes.)

## Local Previews
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://circleci.com/gh/devopsdays/devopsdays-web.svg?branch=main)](https://circleci.com/gh/devopsdays/devopsdays-web) [![Build status](https://ci.appveyor.com/api/projects/status/3lobrrssphdb20xd?svg=true)](https://ci.appveyor.com/project/DevOpsDays/devopsdays-web)
[![Build Status](https://github.com/devopsdays/devopsdays-web/actions/workflows/hugo.yml/badge.svg)
[![license](https://img.shields.io/github/license/devopsdays/devopsdays-theme.svg)](https://github.com/devopsdays/devopsdays-web/blob/main/LICENSE) [![Greenkeeper badge](https://badges.greenkeeper.io/devopsdays/devopsdays-web.svg)](https://greenkeeper.io/)


Expand All @@ -22,7 +22,7 @@ In the instance where you might need to cancel an event that is already listed o

## Site-wide Hugo theme

You may find that you want to improve the site in some way that's not specific to your event. We use a custom Hugo theme, and reference documentation is available in [devopsdays-theme's REFERENCE.md](https://github.com/devopsdays/devopsdays-web/blob/main/themes/devopsdays-theme/REFERENCE.md).
You may find that you want to improve the site in some way that's not specific to your event. We use a custom Hugo theme, and reference documentation is available in [devopsdays-theme's reference.md](https://github.com/devopsdays/devopsdays-web/blob/main/themes/devopsdays-theme/reference.md).

The technical details for contributing to the site-wide theme's development are covered in [devopsdays-theme's CONTRIBUTING.md](https://github.com/devopsdays/devopsdays-web/blob/main/themes/devopsdays-theme/CONTRIBUTING.md).

Expand Down
26 changes: 0 additions & 26 deletions appveyor.yml

This file was deleted.

120 changes: 0 additions & 120 deletions content/blog/2017-Auckland.md

This file was deleted.

Loading

0 comments on commit 8722a80

Please sign in to comment.