@@ -129,9 +129,9 @@ We help engineers ship infrastructure faster with Infrastructure as Code in general-purpose languages.
- Meet our leaders + Meet our leaders
A group for stellar Pulumi community members who have made "above and beyond" contributions to the community.
- Meet our Puluminaries + Meet our Puluminaries
@@ -129,9 +129,9 @@ 
- Engineers love Pulumi! Don’t believe us? Check out what our users have to say.
- Read user quotes + Read user quotesOur team is a diverse and talented group of individuals from all walks of life.
- Browse open positions + Browse open positions {{ end }} diff --git a/layouts/page/leadership.html b/layouts/page/leadership.html index 8f88634fd1bd..395e75267c96 100644 --- a/layouts/page/leadership.html +++ b/layouts/page/leadership.html @@ -4,7 +4,7 @@ {{ define "main" }}{{ .description | markdownify }}
{{ end }} diff --git a/layouts/product/pulumi-insights.html b/layouts/product/pulumi-insights.html index eefb900929b5..6d9417a9f60c 100644 --- a/layouts/product/pulumi-insights.html +++ b/layouts/product/pulumi-insights.html @@ -120,7 +120,7 @@{{ .description | markdownify }}
{{ end }} diff --git a/package.json b/package.json index ac50576e168b..8e2f36f41843 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "private": true, "license": "Apache-2.0", "scripts": { - "minify-css": "node scripts/minify-css.js" + "minify-css": "node scripts/minify-css.js", + "prepare": "husky" }, "dependencies": { "@aws-sdk/client-s3": "^3.427.0", @@ -34,6 +35,7 @@ "typescript": "^4.9.5" }, "devDependencies": { + "husky": "^9.0.11", "prettier": "^2.6.2" } } diff --git a/scripts/ensure.sh b/scripts/ensure.sh index 2f7b7cfd21a2..57e78d9e7ef5 100755 --- a/scripts/ensure.sh +++ b/scripts/ensure.sh @@ -1,14 +1,34 @@ #!/bin/bash -# Make sure the Node version matches what's in .nvmrc (and in our GitHub Actions workflows). -current_version="$(node -v)" -required_version="$(cat .nvmrc)" +set -o errexit -o pipefail -if [ ! $(echo ${current_version} | grep ${required_version}) ]; then - printf "\nIt looks like you're running Node %s, but this project uses Node %s.\n" ${current_version} ${required_version} - printf "If you're using nvm, try running nvm use.\n\n" - exit 1 -fi +check_version() { + tool_name="$1" + executable="$2" + version_string="$(eval $3)" + required_version="$4" + level="$5" + + color_red=$(echo -e "\033[0;31m") + color_yellow=$(echo -e "\033[0;33m") + color_end=$(echo -e "\033[0m") + + details="See the README at https://github.com/pulumi/docs for a list of required tools and versions." + + if ! command -v "$executable" &> /dev/null; then + echo -e "${color_red}error${color_end} This project requires $1, but the '$2' executable is either not installed or not on your PATH." + echo $details + exit 1 + fi + + if [ ! $(echo ${version_string} | grep ${required_version}) ]; then + printf "${color_yellow}warning${color_end} It looks like you're running %s %s, but this project uses version %s.\n" ${tool_name} ${version_string} ${required_version} + echo $details + fi +} +check_version "Node.js" "node" "node -v | sed 's/v\([0-9\.]*\).*$/\1/'" "18" +check_version "Hugo" "hugo" "hugo version | sed 's/hugo v\([0-9\.]*\).*$/\1/'" "0.126.0" +check_version "Yarn" "yarn" "yarn -v | sed 's/v\([0-9\.]*\).*$/\1/'" "1.22" # Install the Node dependencies for the website and the infrastructure. yarn install diff --git a/scripts/format.sh b/scripts/format.sh new file mode 100755 index 000000000000..db8eabdb7570 --- /dev/null +++ b/scripts/format.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +set -o errexit -o pipefail + +yarn prettier --write . diff --git a/yarn.lock b/yarn.lock index 934c9d39c427..6d789733c235 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2894,6 +2894,11 @@ humanize-duration@^3.9.1: resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.27.3.tgz#db654e72ebf5ccfe232c7f56bc58aa3a6fe4df88" integrity sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw== +husky@^9.0.11: + version "9.0.11" + resolved "https://registry.yarnpkg.com/husky/-/husky-9.0.11.tgz#fc91df4c756050de41b3e478b2158b87c1e79af9" + integrity sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw== + iconv-lite@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"