Skip to content

Commit

Permalink
build: Tidy up devbox tooling and upgrade hugo
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmidyson committed Apr 17, 2024
1 parent 2e2935e commit 65c8679
Show file tree
Hide file tree
Showing 9 changed files with 165 additions and 73 deletions.
52 changes: 0 additions & 52 deletions .github/workflows/checks.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .tool-versions

This file was deleted.

10 changes: 2 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ Follow the instructions below to create and preview your new content.
Using [Devbox][] is highly recommended. Follow [these instructions][devbox installation] to install [Devbox][] and
install [direnv][] for shell integration - this is the simplest way to get started.

Alternatively, if you have [asdf][] installed, then you can run `asdf install` to install all required tools.

If you do not have [asdf][] installed, then please manually install [hugo][] following
[these instructions][hugo install].

### Add a new post

To create a new post, run:
Expand Down Expand Up @@ -139,12 +134,11 @@ The D2iQ engineering blog is currently hosted on [Netlify][netlify] but is front
[cloning a fork]: https://docs.github.com/en/get-started/quickstart/contributing-to-projects#cloning-a-fork
[add content]: https://docs.github.com/en/get-started/quickstart/contributing-to-projects#making-and-pushing-changes
[open pr]: https://docs.github.com/en/get-started/quickstart/contributing-to-projects#making-a-pull-request
[asdf]: https://asdf-vm.com/
[hugo]: https://gohugo.io/
[hugo install]: https://gohugo.io/getting-started/installing
[netlify]: https://netlify.com/
[cloudfront]: https://aws.amazon.com/cloudfront/
[eng blog]: https://eng.d2iq.com/
[Devbox]: https://www.jetpack.io/devbox/
[devbox installation]: https://www.jetpack.io/devbox/docs/contributor-quickstart/#install-devbox
[Devbox]: https://www.jetify.com/devbox/
[devbox installation]: https://www.jetify.com/devbox/docs/contributor-quickstart/#install-devbox
[direnv]: https://direnv.net/
3 changes: 3 additions & 0 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"hugo@latest",
"go@latest"
],
"env": {
"DEVBOX_COREPACK_ENABLED": "true"
},
"shell": {
"scripts": {
"serve": [
Expand Down
161 changes: 152 additions & 9 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,165 @@
"lockfile_version": "1",
"packages": {
"go@latest": {
"last_modified": "2023-06-29T16:20:38Z",
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#go",
"last_modified": "2024-03-22T11:26:23Z",
"resolved": "github:NixOS/nixpkgs/a3ed7406349a9335cb4c2a71369b697cecd9d351#go",
"source": "devbox-search",
"version": "1.20.5"
"version": "1.22.1",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/n1k6wf8q10q7k0863gb78b1rf0j07r7r-go-1.22.1",
"default": true
}
],
"store_path": "/nix/store/n1k6wf8q10q7k0863gb78b1rf0j07r7r-go-1.22.1"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/fl6cjlp5bvykfz1kxrw687zxzld25pn7-go-1.22.1",
"default": true
}
],
"store_path": "/nix/store/fl6cjlp5bvykfz1kxrw687zxzld25pn7-go-1.22.1"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/xgdp7gnf6vzr2ick2ip1lhq4cww65p7w-go-1.22.1",
"default": true
}
],
"store_path": "/nix/store/xgdp7gnf6vzr2ick2ip1lhq4cww65p7w-go-1.22.1"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/bp39dh48cdqp89hk5mpdi1lxdf0mjl7x-go-1.22.1",
"default": true
}
],
"store_path": "/nix/store/bp39dh48cdqp89hk5mpdi1lxdf0mjl7x-go-1.22.1"
}
}
},
"hugo@latest": {
"last_modified": "2023-06-29T16:20:38Z",
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#hugo",
"last_modified": "2024-03-28T11:17:37Z",
"resolved": "github:NixOS/nixpkgs/72c6ed328aa4e5d9151b1a512f6ad83aca7529fa#hugo",
"source": "devbox-search",
"version": "0.114.1"
"version": "0.124.1",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/4241851xvc5xag3hgc287blzmdqvv6r6-hugo-0.124.1",
"default": true
}
],
"store_path": "/nix/store/4241851xvc5xag3hgc287blzmdqvv6r6-hugo-0.124.1"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/3d20dg1yp4s47m68hla2mlh89xv495bl-hugo-0.124.1",
"default": true
}
],
"store_path": "/nix/store/3d20dg1yp4s47m68hla2mlh89xv495bl-hugo-0.124.1"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/afjagghkqyn9xglpldc0s39dwa5m55d9-hugo-0.124.1",
"default": true
}
],
"store_path": "/nix/store/afjagghkqyn9xglpldc0s39dwa5m55d9-hugo-0.124.1"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/29vrmh3b7i56ap04wj66y9mmxib8q372-hugo-0.124.1",
"default": true
}
],
"store_path": "/nix/store/29vrmh3b7i56ap04wj66y9mmxib8q372-hugo-0.124.1"
}
}
},
"[email protected]": {
"last_modified": "2023-05-07T06:59:10Z",
"resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#nodejs-19_x",
"last_modified": "2023-04-13T03:55:09Z",
"plugin_version": "0.0.2",
"resolved": "github:NixOS/nixpkgs/96ba1c52e54e74c3197f4d43026b3f3d92e83ff9#nodejs-19_x",
"source": "devbox-search",
"version": "19.9.0"
"version": "19.9.0",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/mknm4z3zw3ai12w7jgghzbc41g1qbsyv-nodejs-19.9.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/98vh8cynnk4anzh5zjbchb0hakn1s6qk-nodejs-19.9.0-libv8"
}
],
"store_path": "/nix/store/mknm4z3zw3ai12w7jgghzbc41g1qbsyv-nodejs-19.9.0"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/gk89camhas4qzg5lm2x25pp6jqlw83pd-nodejs-19.9.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/0r07qi5cx91hfcjrh2jlqvq6jc5j78cc-nodejs-19.9.0-libv8"
}
],
"store_path": "/nix/store/gk89camhas4qzg5lm2x25pp6jqlw83pd-nodejs-19.9.0"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/4nn7pa6nc9w9axfnps5i1wfkj3l32wgn-nodejs-19.9.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/f9akrlnz0b7ib1xihzgl17pm782xs0il-nodejs-19.9.0-libv8"
}
],
"store_path": "/nix/store/4nn7pa6nc9w9axfnps5i1wfkj3l32wgn-nodejs-19.9.0"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/r2g2fwdp5fn36v4vhxrc50inr6amp6cm-nodejs-19.9.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/spww21v897238q1bblkvy76vsfjjks2z-nodejs-19.9.0-libv8"
}
],
"store_path": "/nix/store/r2g2fwdp5fn36v4vhxrc50inr6amp6cm-nodejs-19.9.0"
}
}
}
}
}
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ module github.com/mesosphere/d2iq-engineering-blog

go 1.18

require github.com/hugo-mods/icons v0.0.0-20220508080705-d938a1900b1c // indirect
require (
github.com/FortAwesome/Font-Awesome v0.0.0-20210316185733-d79d85c3fad8 // indirect
github.com/hugo-mods/icons v0.0.0-20220508080705-d938a1900b1c // indirect
)
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github.com/FortAwesome/Font-Awesome v0.0.0-20210316185733-d79d85c3fad8 h1:3h1ZlZmKNqZtiTD6FF7GijnIB/PU9/jR+dclHF80pFE=
github.com/FortAwesome/Font-Awesome v0.0.0-20210316185733-d79d85c3fad8/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
github.com/hugo-mods/icons v0.0.0-20220508080705-d938a1900b1c h1:BHTy85KaX2uQnC+1i5NRVAxiJNOwpIwQXlY/zpLD6zA=
github.com/hugo-mods/icons v0.0.0-20220508080705-d938a1900b1c/go.mod h1:sPodUyqumOYz75PKIwmqOYZXLIcLAujn7V9+1Hk4VW8=
2 changes: 2 additions & 0 deletions hugo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ removePathAccents = true
disableKinds = [ "taxonomy" ]
ignoreErrors = ["error-disable-taxonomy"]

capitalizelisttitles = false

[security.exec]
osEnv = ['.*']

Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
command = "hugo --gc --minify"

[build.environment]
HUGO_VERSION = "0.114.1"
HUGO_VERSION = "0.124.1"
HUGO_ENV = "production"
HUGO_ENABLEGITINFO = "true"
NODE_VERSION = "19.9.0"
Expand Down

0 comments on commit 65c8679

Please sign in to comment.