From 6fa5634e7becbfe9bc2777103b9503e5d5029af8 Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Wed, 12 Apr 2023 15:39:14 -0700 Subject: [PATCH 1/9] build(deps): upgrade docsy + hugo --- .env | 2 +- .github/workflows/gh-pages.yml | 2 +- Dockerfile | 2 +- config.toml | 2 +- yarn.lock | 196 ++++++++++++++++----------------- 5 files changed, 102 insertions(+), 102 deletions(-) diff --git a/.env b/.env index 827def2c..bb2f3477 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -HUGO_VERSION=0.101.0 +HUGO_VERSION=0.107.0 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index a2ba2f16..dc4eae19 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -39,7 +39,7 @@ jobs: run: | yarn install hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io - hugo mod get github.com/google/docsy@v0.4.0 + hugo mod get github.com/google/docsy@v0.6.0 hugo --minify - name: Deploy diff --git a/Dockerfile b/Dockerfile index a75f7943..45096141 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG HUGO_VERSION=0.101.0 +ARG HUGO_VERSION=0.107.0 ARG DIST_TAG=-ext-ubuntu FROM klakegg/hugo:${HUGO_VERSION}${DIST_TAG} diff --git a/config.toml b/config.toml index d8e49c81..6e67c6f3 100644 --- a/config.toml +++ b/config.toml @@ -39,7 +39,7 @@ pygmentsStyle = "tango" proxy = "direct" [module.hugoVersion] extended = true - min = "0.101.0" + min = "0.107.0" [[module.imports]] path = "github.com/google/docsy" disable = false diff --git a/yarn.lock b/yarn.lock index c2c4e852..caa419f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -51,11 +51,11 @@ "@octokit/types" "^6.0.3" "@octokit/auth-token@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.1.tgz#88bc2baf5d706cb258474e722a720a8365dff2ec" - integrity sha512-/USkK4cioY209wXRpund6HZzHo9GmjakpV9ycOkpMcMxMk7QVcVFVyCMtzvXYiHsB2crgDgrtNYSELYFBXhhaA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.3.tgz#ce7e48a3166731f26068d7a7a7996b5da58cbe0c" + integrity sha512-/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA== dependencies: - "@octokit/types" "^7.0.0" + "@octokit/types" "^9.0.0" "@octokit/core@^3.6.0": version "3.6.0" @@ -93,10 +93,10 @@ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0" integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ== -"@octokit/openapi-types@^13.9.0": - version "13.9.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-13.9.0.tgz#847a31b174b44f33a09615a83bc20eeaa59e9ce0" - integrity sha512-MOYjRyLIM0zzNb9RfEwVK6HLIc2nIF2OMVtMqiNOGbX0SHrQvQbI6X1K16ktmaHr8WUBv+eeul8cD9mz4rNiWQ== +"@octokit/openapi-types@^16.0.0": + version "16.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-16.0.0.tgz#d92838a6cd9fb4639ca875ddb3437f1045cc625e" + integrity sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA== "@octokit/plugin-paginate-rest@^2.16.8": version "2.21.3" @@ -141,12 +141,12 @@ dependencies: "@octokit/openapi-types" "^12.11.0" -"@octokit/types@^7.0.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-7.3.0.tgz#658f916c4a53b552a8f95f866589abae6dbfc7b5" - integrity sha512-7Ar22AVxsJBYZuPkGQwFQybGt2YjuP6j6Z36bPntIYy3R9qSowB55mXOsb16hc0UqtJkYBrRMVXKlaX1OHsh1g== +"@octokit/types@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.0.0.tgz#6050db04ddf4188ec92d60e4da1a2ce0633ff635" + integrity sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw== dependencies: - "@octokit/openapi-types" "^13.9.0" + "@octokit/openapi-types" "^16.0.0" "@tootallnate/once@1": version "1.1.2" @@ -159,9 +159,9 @@ acorn-walk@^8.2.0: integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^8.7.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" - integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: version "6.0.2" @@ -183,9 +183,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -208,21 +208,21 @@ at-least-node@^1.0.0: integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== autoprefixer@^10.2.5: - version "10.4.8" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5" - integrity sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw== + version "10.4.14" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d" + integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ== dependencies: - browserslist "^4.21.3" - caniuse-lite "^1.0.30001373" + browserslist "^4.21.5" + caniuse-lite "^1.0.30001464" fraction.js "^4.2.0" normalize-range "^0.1.2" picocolors "^1.0.0" postcss-value-parser "^4.2.0" before-after-hook@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e" - integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ== + version "2.2.3" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c" + integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ== binary-extensions@^2.0.0: version "2.2.0" @@ -230,9 +230,9 @@ binary-extensions@^2.0.0: integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== bootstrap@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.1.tgz#45f97ff05cbe828bad807b014d8425f3aeb8ec3a" - integrity sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA== + version "5.2.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b" + integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ== braces@^3.0.2, braces@~3.0.2: version "3.0.2" @@ -241,25 +241,25 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.21.3: - version "4.21.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" - integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== +browserslist@^4.21.5: + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001370" - electron-to-chromium "^1.4.202" - node-releases "^2.0.6" - update-browserslist-db "^1.0.5" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373: - version "1.0.30001392" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001392.tgz#b1238a0f75ee72ca426d1b84b7799b89267267c2" - integrity sha512-17kzHgeLmROc2n7Cev9XRrAe3Zx4qGwn3eHEhsYCxoYQIrVVa9tbGu0LEUflG2mUsBGtWcv8iNilmxhvRyv3hg== +caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464: + version "1.0.30001478" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001478.tgz#0ef8a1cf8b16be47a0f9fc4ecfc952232724b32a" + integrity sha512-gMhDyXGItTHipJj2ApIvR+iVB5hd0KP3svMWWXDvZOmjzJJassGLMfxRkQCSYgGd2gtdL/ReeiyvMSFD1Ss6Mw== chalk@^4.0.0: version "4.1.2" @@ -328,14 +328,14 @@ deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== degenerator@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235" - integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.3.tgz#a081ac30052ca84e1d1c6e86c972ae8dabbc4079" + integrity sha512-FTq/qYMeBJACu1gHcXJvzsRBTK6aw5zWCYbEnIOyamOt5UJufWJRQ5XfDb6OuayfJWvmWAHgcZyt43vm/hbj7g== dependencies: ast-types "^0.13.2" escodegen "^1.8.1" esprima "^4.0.0" - vm2 "^3.9.8" + vm2 "^3.9.11" depd@2.0.0: version "2.0.0" @@ -359,10 +359,10 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -electron-to-chromium@^1.4.202: - version "1.4.244" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.244.tgz#ae9b56ed4ae2107e3a860dad80ed662c936e369e" - integrity sha512-E21saXLt2eTDaTxgUtiJtBUqanF9A32wZasAwDZ8gvrqXoxrBrbwtDCx7c/PQTLp81wj4X0OLDeoGQg7eMo3+w== +electron-to-chromium@^1.4.284: + version "1.4.361" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.361.tgz#010ddd5e623470ab9d1bf776b009d11c3669a4e3" + integrity sha512-VocVwjPp05HUXzf3xmL0boRn5b0iyqC7amtDww84Jb1QJNPBc7F69gJyEeXRoriLBC4a5pSyckdllrXAg4mmRA== emoji-regex@^8.0.0: version "8.0.0" @@ -402,9 +402,9 @@ esutils@^2.0.2: integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -418,9 +418,9 @@ fast-levenshtein@~2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -515,9 +515,9 @@ globby@^11.0.0: slash "^3.0.0" graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== has-flag@^4.0.0: version "4.0.0" @@ -560,9 +560,9 @@ iconv-lite@0.4.24: safer-buffer ">= 2.1.2 < 3" ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== inherits@2.0.4, inherits@~2.0.1: version "2.0.4" @@ -619,9 +619,9 @@ isarray@0.0.1: integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== jquery@^3.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" - integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== + version "3.6.4" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f" + integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ== jsonfile@^4.0.0: version "4.0.0" @@ -648,9 +648,9 @@ levn@~0.3.0: type-check "~0.3.2" lilconfig@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4" - integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg== + version "2.1.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" + integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== lru-cache@^5.1.1: version "5.1.1" @@ -678,9 +678,9 @@ ms@2.1.2: integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== netmask@^2.0.2: version "2.0.2" @@ -688,16 +688,16 @@ netmask@^2.0.2: integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== node-fetch@^2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + version "2.6.9" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" + integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== dependencies: whatwg-url "^5.0.0" -node-releases@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" - integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== +node-releases@^2.0.8: + version "2.0.10" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" + integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -817,9 +817,9 @@ postcss-value-parser@^4.2.0: integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.4.14: - version "8.4.16" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" - integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== + version "8.4.21" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" + integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== dependencies: nanoid "^3.3.4" picocolors "^1.0.0" @@ -860,9 +860,9 @@ queue-microtask@^1.2.2: integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== raw-body@^2.2.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== dependencies: bytes "3.1.2" http-errors "2.0.0" @@ -940,9 +940,9 @@ socks-proxy-agent@5, socks-proxy-agent@^5.0.0: socks "^2.3.3" socks@^2.3.3: - version "2.7.0" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" - integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== dependencies: ip "^2.0.0" smart-buffer "^4.2.0" @@ -1013,9 +1013,9 @@ tr46@~0.0.3: integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== tslib@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== type-check@~0.3.2: version "0.3.2" @@ -1044,18 +1044,18 @@ unpipe@1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -update-browserslist-db@^1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz#16279639cff1d0f800b14792de43d97df2d11b7d" - integrity sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg== +update-browserslist-db@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== dependencies: escalade "^3.1.1" picocolors "^1.0.0" -vm2@^3.9.8: - version "3.9.11" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" - integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== +vm2@^3.9.11: + version "3.9.16" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" + integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" From 200d120391a8c007a6d53edb00ec1c686684a437 Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Mon, 24 Apr 2023 14:00:50 -0700 Subject: [PATCH 2/9] feat: add markdown link checker resolves #446 --- .github/workflows/check-markdown-links.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/check-markdown-links.yml diff --git a/.github/workflows/check-markdown-links.yml b/.github/workflows/check-markdown-links.yml new file mode 100644 index 00000000..456ada42 --- /dev/null +++ b/.github/workflows/check-markdown-links.yml @@ -0,0 +1,18 @@ +name: Check Markdown links + +on: + + push: + + pull_request: + branches: [ "develop" ] + + +jobs: + markdown-link-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: gaurav-nelson/github-action-markdown-link-check@v1 + with: + use-quiet-mode: 'yes' From 22dbb9c1c4f2000d03a7bbc33075ab5d3a19c38e Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Mon, 24 Apr 2023 14:04:52 -0700 Subject: [PATCH 3/9] build(deps): yarn upgrade mount yarn.lock into container for easier updates --- docker-compose.yml | 1 + yarn.lock | 60 +++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5032ebdc..381f7f36 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,3 +18,4 @@ services: - ./.git:/src/.git - /src/themes - /src/node_modules + - ./yarn.lock:/src/yarn.lock diff --git a/yarn.lock b/yarn.lock index caa419f3..bbac488a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -93,10 +93,10 @@ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0" integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ== -"@octokit/openapi-types@^16.0.0": - version "16.0.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-16.0.0.tgz#d92838a6cd9fb4639ca875ddb3437f1045cc625e" - integrity sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA== +"@octokit/openapi-types@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.0.0.tgz#7356d287f48b20e9a1f497ef8dfaabdff9cf8622" + integrity sha512-V8BVJGN0ZmMlURF55VFHFd/L92XQQ43KvFjNmY1IYbCN3V/h/uUFV6iQi19WEHM395Nn+1qhUbViCAD/1czzog== "@octokit/plugin-paginate-rest@^2.16.8": version "2.21.3" @@ -142,11 +142,11 @@ "@octokit/openapi-types" "^12.11.0" "@octokit/types@^9.0.0": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.0.0.tgz#6050db04ddf4188ec92d60e4da1a2ce0633ff635" - integrity sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw== + version "9.1.2" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.1.2.tgz#1a8d35b1f4a3d2ad386e223f249dd5f7506979c1" + integrity sha512-LPbJIuu1WNoRHbN4UMysEdlissRFpTCWyoKT7kHPufI8T+XX33/qilfMWJo3mCOjNIKu0+43oSQPf+HJa0+TTQ== dependencies: - "@octokit/openapi-types" "^16.0.0" + "@octokit/openapi-types" "^17.0.0" "@tootallnate/once@1": version "1.1.2" @@ -257,9 +257,9 @@ bytes@3.1.2: integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464: - version "1.0.30001478" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001478.tgz#0ef8a1cf8b16be47a0f9fc4ecfc952232724b32a" - integrity sha512-gMhDyXGItTHipJj2ApIvR+iVB5hd0KP3svMWWXDvZOmjzJJassGLMfxRkQCSYgGd2gtdL/ReeiyvMSFD1Ss6Mw== + version "1.0.30001481" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912" + integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ== chalk@^4.0.0: version "4.1.2" @@ -328,14 +328,14 @@ deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== degenerator@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.3.tgz#a081ac30052ca84e1d1c6e86c972ae8dabbc4079" - integrity sha512-FTq/qYMeBJACu1gHcXJvzsRBTK6aw5zWCYbEnIOyamOt5UJufWJRQ5XfDb6OuayfJWvmWAHgcZyt43vm/hbj7g== + version "3.0.4" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.4.tgz#07ccf95bc11044a37a6efc2f66029fb636e31f24" + integrity sha512-Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw== dependencies: ast-types "^0.13.2" escodegen "^1.8.1" esprima "^4.0.0" - vm2 "^3.9.11" + vm2 "^3.9.17" depd@2.0.0: version "2.0.0" @@ -360,9 +360,9 @@ dir-glob@^3.0.1: path-type "^4.0.0" electron-to-chromium@^1.4.284: - version "1.4.361" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.361.tgz#010ddd5e623470ab9d1bf776b009d11c3669a4e3" - integrity sha512-VocVwjPp05HUXzf3xmL0boRn5b0iyqC7amtDww84Jb1QJNPBc7F69gJyEeXRoriLBC4a5pSyckdllrXAg4mmRA== + version "1.4.370" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.370.tgz#72cff9a1d08dcad8d5656306eeeff5b33b063e16" + integrity sha512-c+wzD4sCYQeNeasbnArwsU3ig6+lR6bwQmxfMjB6bx+XoopVSPFp+7ZLxqa90MTC+Tq9QQ5l7zsMNG9GgMBorg== emoji-regex@^8.0.0: version "8.0.0" @@ -677,7 +677,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -nanoid@^3.3.4: +nanoid@^3.3.6: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== @@ -817,11 +817,11 @@ postcss-value-parser@^4.2.0: integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.4.14: - version "8.4.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" - integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== + version "8.4.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab" + integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA== dependencies: - nanoid "^3.3.4" + nanoid "^3.3.6" picocolors "^1.0.0" source-map-js "^1.0.2" @@ -1045,17 +1045,17 @@ unpipe@1.0.0: integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== update-browserslist-db@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + version "1.0.11" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" + integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== dependencies: escalade "^3.1.1" picocolors "^1.0.0" -vm2@^3.9.11: - version "3.9.16" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" - integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== +vm2@^3.9.17: + version "3.9.17" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" + integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" From 3a1f9de91947ab516fb1856015d9cd0543e4ca4d Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Thu, 27 Apr 2023 15:32:56 -0700 Subject: [PATCH 4/9] feat: try htmltest instead add DOCSY_VERSION to .env also --- .env | 3 +- .github/workflows/check-markdown-links.yml | 18 --------- .github/workflows/run-htmltest.yml | 43 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/check-markdown-links.yml create mode 100644 .github/workflows/run-htmltest.yml diff --git a/.env b/.env index bb2f3477..7527c46f 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ -HUGO_VERSION=0.107.0 +HUGO_VERSION="0.107.0" +DOCSY_VERSION="v0.6.0" diff --git a/.github/workflows/check-markdown-links.yml b/.github/workflows/check-markdown-links.yml deleted file mode 100644 index 456ada42..00000000 --- a/.github/workflows/check-markdown-links.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Check Markdown links - -on: - - push: - - pull_request: - branches: [ "develop" ] - - -jobs: - markdown-link-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-quiet-mode: 'yes' diff --git a/.github/workflows/run-htmltest.yml b/.github/workflows/run-htmltest.yml new file mode 100644 index 00000000..e9ae5c08 --- /dev/null +++ b/.github/workflows/run-htmltest.yml @@ -0,0 +1,43 @@ +name: Run htmltest over rendered content +on: + push: + pull_request: + branches: [ "develop" ] + +jobs: + htmltest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Read .env hugo version + id: hugo-version + run: | + . ./.env + echo "::set-output name=HUGO_VERSION::${HUGO_VERSION}" + echo "::set-output name=DOCSY_VERSION::${DOCSY_VERSION}" + + - name: Add hugo nodejs dependencies + uses: actions/setup-node@v3 + with: + node-version: "18" + + - name: Setup Hugo + uses: peaceiris/actions-hugo@v2 + with: + # sync versions with docker-compose .env ala + # https://github.com/marketplace/actions/hugo-setup#%EF%B8%8F-read-hugo-version-from-file + hugo-version: "${{ steps.hugo-version.outputs.HUGO_VERSION }}" + extended: true + + - name: Build Hugo site + env: + HUGO_ENV: "production" + run: | + yarn install + hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io + hugo mod get github.com/google/docsy@${{ steps.hugo-version.outputs.DOCSY_VERSION }} + hugo --minify -d $GITHUB_WORKSPACE/dist + - name: run htmltest + continue-on-error: true + uses: wjdp/htmltest-action@master From 7f6e4fef44eef6cba95273d635ab8b0fb50b128f Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Thu, 27 Apr 2023 15:55:11 -0700 Subject: [PATCH 5/9] fix: add htmltest config --- .github/workflows/run-htmltest.yml | 9 ++++++++- .htmltest.yml | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .htmltest.yml diff --git a/.github/workflows/run-htmltest.yml b/.github/workflows/run-htmltest.yml index e9ae5c08..045ade25 100644 --- a/.github/workflows/run-htmltest.yml +++ b/.github/workflows/run-htmltest.yml @@ -39,5 +39,12 @@ jobs: hugo mod get github.com/google/docsy@${{ steps.hugo-version.outputs.DOCSY_VERSION }} hugo --minify -d $GITHUB_WORKSPACE/dist - name: run htmltest - continue-on-error: true uses: wjdp/htmltest-action@master + with: + config: .htmltest.yml + - name: archive htmltest results + uses: actions/upload-artifact@v3 + with: + name: htmltest-report + path: tmp/.htmltest/htmltest.log + retention-days: 5 diff --git a/.htmltest.yml b/.htmltest.yml new file mode 100644 index 00000000..4181808c --- /dev/null +++ b/.htmltest.yml @@ -0,0 +1 @@ +DirectoryPath: "dist" From 179ecec59c14cd429f92fe0e3f5665ccefe7b181 Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Thu, 27 Apr 2023 16:35:21 -0700 Subject: [PATCH 6/9] fix: broken links reported by htmltest --- content/en/about/members-council/index.md | 2 +- content/en/contribute/_index.md | 4 ++-- content/en/standards/documentation/_index.md | 2 +- content/en/standards/reusability/_index.md | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content/en/about/members-council/index.md b/content/en/about/members-council/index.md index 59ae0ef5..54e75be4 100644 --- a/content/en/about/members-council/index.md +++ b/content/en/about/members-council/index.md @@ -128,7 +128,7 @@ weight: 100 + href="https://www.sciencedirect.com/journal/environmental-modelling-and-software"> {{< imgproc blank Fit "200x200" >}}

Environmental Modelling and Software Journal

diff --git a/content/en/contribute/_index.md b/content/en/contribute/_index.md index cba63ff8..3873832a 100644 --- a/content/en/contribute/_index.md +++ b/content/en/contribute/_index.md @@ -64,5 +64,5 @@ OMF Members Council Representatives are eligible to `vote` on proposed changes. 3. You can sort and filter the pull requests table by clicking on the table header names (Author, Label, Projects, etc.). For example, clicking on **_Author_** will allow you to select pull requests by a specific author. The **_sort_** menu lets you sort pull requests chronologically or by the number of comments or reactions. -For more details on creating a pull request please check out -[GitHub\'s guide for creating a pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). +For more details on creating a pull request refer to +[GitHub\'s guide for creating a pull request](https://docs.github.com/en/pull-requests). diff --git a/content/en/standards/documentation/_index.md b/content/en/standards/documentation/_index.md index b08a8038..4e89163e 100644 --- a/content/en/standards/documentation/_index.md +++ b/content/en/standards/documentation/_index.md @@ -38,7 +38,7 @@ We suggest three main categories of documentation: - Description of the model, including its purpose or goals and the type or formalism of the model (e.g., system dynamic, agent based model, machine learning), preferably accompanied by relevant keywords - Name(s) and contact information of the developer(s)/author(s) - Date of release -- [OSI-approved license](https://opensource.org/licenses) +- [OSI-approved license](https://choosealicense.com/) - [How to cite the software](https://www.force11.org/software-citation-principles) - Location where the model is posted or published (e.g. PID or DOI) - Computer language or platform used for programming diff --git a/content/en/standards/reusability/_index.md b/content/en/standards/reusability/_index.md index 42f2328b..0eb1187b 100644 --- a/content/en/standards/reusability/_index.md +++ b/content/en/standards/reusability/_index.md @@ -52,7 +52,7 @@ In order to meet the ideal standards, computational models should: Build Docker images from research code: - stencila/dockta https://github.com/stencila/dockta - ReproZip https://www.reprozip.org/ -- SciUnit https://sciunit.run/ +- SciUnit https://github.com/scidash/sciunit - binder https://mybinder.org/ - repo2docker https://repo2docker.readthedocs.io (used by binder) @@ -68,8 +68,8 @@ OMF may consider developing scaffolding for common modeling frameworks that redu ## Examples and References - [Lorena Barba's reproducible workflow for computational fluid dynamics](https://doi.org/10.5281/zenodo.2642710) https://github.com/barbagroup/cloud-repro -- https://www.practicereproducibleresearch.org/ -- https://reproduciblescience.org/directory/ +- https://carpentries-incubator.github.io/good-enough-practices/ +- http://www.practicereproducibleresearch.org/ - [Software Deposit Guidelines from SSI](https://softwaresaved.github.io/software-deposit-guidance/HowToDescribeSoftwareDeposit.html) - [Proposed Standards for Peer-Reviewed Publication of Computer Code](https://doi.org/10.2134/agronj2015.0481) - TODO: find or build example codebases that meet minimal and ideal standards From 808e258b954612031703535ad4b26ccda82db958 Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Thu, 27 Apr 2023 16:41:43 -0700 Subject: [PATCH 7/9] refactor(build): refine github actions - no need to run gh-pages deploy on pull requests as htmltest will exercise publishing the site to check links - add continue-on-error to htmltest for now, there are a few false positives especially with farther away sites in Australia / Asia http://geomodeling.njnu.edu.cn/ appears to be completely down atm --- .github/workflows/gh-pages.yml | 12 +++++------- .github/workflows/run-htmltest.yml | 1 + go.mod | 5 +++++ 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 go.mod diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index dc4eae19..0514881f 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -4,13 +4,10 @@ on: push: branches: - develop - pull_request: - branches: - - develop jobs: deploy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -19,11 +16,12 @@ jobs: run: | . ./.env echo "::set-output name=HUGO_VERSION::${HUGO_VERSION}" + echo "::set-output name=DOCSY_VERSION::${DOCSY_VERSION}" - name: Add hugo nodejs dependencies uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" - name: Setup Hugo uses: peaceiris/actions-hugo@v2 @@ -39,10 +37,10 @@ jobs: run: | yarn install hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io - hugo mod get github.com/google/docsy@v0.6.0 + hugo mod get github.com/google/docsy@${{ steps.hugo-version.outputs.DOCSY_VERSION }} hugo --minify - - name: Deploy + - name: Deploy to Pages if: github.event_name == 'push' uses: peaceiris/actions-gh-pages@v3 env: diff --git a/.github/workflows/run-htmltest.yml b/.github/workflows/run-htmltest.yml index 045ade25..f4c30f94 100644 --- a/.github/workflows/run-htmltest.yml +++ b/.github/workflows/run-htmltest.yml @@ -39,6 +39,7 @@ jobs: hugo mod get github.com/google/docsy@${{ steps.hugo-version.outputs.DOCSY_VERSION }} hugo --minify -d $GITHUB_WORKSPACE/dist - name: run htmltest + continue-on-error: true uses: wjdp/htmltest-action@master with: config: .htmltest.yml diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..f4cb09af --- /dev/null +++ b/go.mod @@ -0,0 +1,5 @@ +module github.com/openmodelingfoundation/openmodelingfoundation.github.io + +go 1.17 + +require github.com/google/docsy v0.6.0 // indirect From 4d4d7220d4222040f19ed95e9166cc5d9c69d116 Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Thu, 27 Apr 2023 17:04:08 -0700 Subject: [PATCH 8/9] fix: remove hugo mod installation / initialization --- .github/workflows/run-htmltest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run-htmltest.yml b/.github/workflows/run-htmltest.yml index f4c30f94..7881b403 100644 --- a/.github/workflows/run-htmltest.yml +++ b/.github/workflows/run-htmltest.yml @@ -21,6 +21,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: "18" + cache: 'npm' - name: Setup Hugo uses: peaceiris/actions-hugo@v2 @@ -35,8 +36,6 @@ jobs: HUGO_ENV: "production" run: | yarn install - hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io - hugo mod get github.com/google/docsy@${{ steps.hugo-version.outputs.DOCSY_VERSION }} hugo --minify -d $GITHUB_WORKSPACE/dist - name: run htmltest continue-on-error: true From 430003e4aa31230be1ccf6044b955f62359e0923 Mon Sep 17 00:00:00 2001 From: Allen Lee Date: Thu, 27 Apr 2023 17:28:11 -0700 Subject: [PATCH 9/9] fix: prevent htmltest gh action from running twice target open pull requests against develop or pushes to develop only --- .github/workflows/gh-pages.yml | 5 ++--- .github/workflows/run-htmltest.yml | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 0514881f..dac7d6d0 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -22,6 +22,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: "18" + cache: 'npm' - name: Setup Hugo uses: peaceiris/actions-hugo@v2 @@ -36,9 +37,7 @@ jobs: HUGO_ENV: "production" run: | yarn install - hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io - hugo mod get github.com/google/docsy@${{ steps.hugo-version.outputs.DOCSY_VERSION }} - hugo --minify + hugo --minify --gc - name: Deploy to Pages if: github.event_name == 'push' diff --git a/.github/workflows/run-htmltest.yml b/.github/workflows/run-htmltest.yml index 7881b403..d61f46db 100644 --- a/.github/workflows/run-htmltest.yml +++ b/.github/workflows/run-htmltest.yml @@ -1,6 +1,7 @@ name: Run htmltest over rendered content on: push: + branches: [ "develop" ] pull_request: branches: [ "develop" ] @@ -36,7 +37,7 @@ jobs: HUGO_ENV: "production" run: | yarn install - hugo --minify -d $GITHUB_WORKSPACE/dist + hugo --minify --gc -d $GITHUB_WORKSPACE/dist - name: run htmltest continue-on-error: true uses: wjdp/htmltest-action@master