diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml deleted file mode 100644 index 7803c92..0000000 --- a/.github/workflows/checks.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2021-2023 D2iQ, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -name: checks - -on: - push: - branches: - - main - pull_request: - types: - - opened - - synchronize - - reopened - branches: - - main - -jobs: - consistent-tool-versions: - runs-on: ubuntu-22.04 - steps: - - name: Check out code - uses: actions/checkout@v4 - - # Setup github authentication to ensure Github's rate limits are not hit. - - name: Configure nix GitHub access-tokens - run: | - mkdir -p ~/.config/nix - echo "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}" > ~/.config/nix/nix.conf - - - name: Install devbox - uses: jetify-com/devbox-install-action@v0.9.0 - with: - enable-cache: true - - - name: Set asdf and netlify tool versions to same as devbox - run: | - NODE_VERSION=$(devbox run -- node --version | sed 's/^v//') - GO_VERSION=$(devbox run -- go version | cut -d' ' -f 3 | grep -o '[0-9.]\+') - HUGO_VERSION=$(devbox run -- hugo version | cut -d' ' -f 2 | grep -o '[0-9.]\+') - sed -i -e "s/hugo .\+$/hugo extended_${HUGO_VERSION}/" \ - -e "s/nodejs .\+$/nodejs ${NODE_VERSION}/" \ - -e "s/golang .\+$/golang ${GO_VERSION}/" \ - .tool-versions - sed -i -e "s/HUGO_VERSION = .\+$/HUGO_VERSION = \"${HUGO_VERSION}\"/" \ - -e "s/NODE_VERSION = .\+$/NODE_VERSION = \"${NODE_VERSION}\"/" \ - netlify.toml - env: - GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Check if changed files - run: git diff --exit-code diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 6376eea..0000000 --- a/.tool-versions +++ /dev/null @@ -1,2 +0,0 @@ -hugo extended_0.114.1 -nodejs 19.9.0 diff --git a/README.md b/README.md index 59d34c9..b34165b 100644 --- a/README.md +++ b/README.md @@ -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: @@ -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/ diff --git a/devbox.json b/devbox.json index b8867df..260e24a 100644 --- a/devbox.json +++ b/devbox.json @@ -4,6 +4,9 @@ "hugo@latest", "go@latest" ], + "env": { + "DEVBOX_COREPACK_ENABLED": "true" + }, "shell": { "scripts": { "serve": [ diff --git a/devbox.lock b/devbox.lock index 92d3259..acdba2a 100644 --- a/devbox.lock +++ b/devbox.lock @@ -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" + } + } }, "nodejs@19.9.0": { - "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" + } + } } } } diff --git a/go.mod b/go.mod index 14199fe..a3d4640 100644 --- a/go.mod +++ b/go.mod @@ -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 +) diff --git a/go.sum b/go.sum index 5eface7..6d95074 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/hugo.toml b/hugo.toml index 8c5b899..7050f7d 100644 --- a/hugo.toml +++ b/hugo.toml @@ -12,6 +12,8 @@ removePathAccents = true disableKinds = [ "taxonomy" ] ignoreErrors = ["error-disable-taxonomy"] +capitalizelisttitles = false + [security.exec] osEnv = ['.*'] diff --git a/netlify.toml b/netlify.toml index 2b5fc16..3f89109 100644 --- a/netlify.toml +++ b/netlify.toml @@ -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"