From 08870e856a2d5028afa3d8862be44e15eab0a74b Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 18 Oct 2023 22:39:59 -0700 Subject: [PATCH 1/8] Bump proto. --- Cargo.lock | 30 +++++++++++++++--------------- Cargo.toml | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb0a73fbe45..e10de59a7c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4661,9 +4661,9 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95344f1074fd611a4652e1f8d16be6991059c312831f40483bbe750a84558a09" +checksum = "01d869626fe7c126fee3ad194ff6e275c69097c7329cf9cb5b233df99dc7206d" dependencies = [ "cached", "extism", @@ -4692,9 +4692,9 @@ dependencies = [ [[package]] name = "proto_pdk_api" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5c2ebb2bebee2804153fabaffdf0ed19268d56b814fec5670f0207adde625b" +checksum = "8d69998a2bdf573616730119828c7d6775a2a098b97fe9ed2973c25f3b2aa8ff" dependencies = [ "anyhow", "semver", @@ -4834,14 +4834,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick 1.0.1", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4855,13 +4855,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick 1.0.1", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -4872,9 +4872,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "relative-path" @@ -5189,9 +5189,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 3a3819e8f38..510000abc19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,9 +39,9 @@ pathdiff = "0.2.1" petgraph = { version = "0.6.4", default-features = false, features = [ "serde-1", ] } -proto_core = "0.19.3" +proto_core = "0.19.4" relative-path = { version = "1.9.0", features = ["serde"] } -regex = "1.9.6" +regex = "1.10.2" reqwest = { version = "0.11.22", default-features = false, features = [ "rustls-tls-native-roots", # We don't use openssl but its required for musl builds From fd8f4945f5571f6318131d5798bd809922cdd817 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 18 Oct 2023 22:41:59 -0700 Subject: [PATCH 2/8] Bump buildjet. --- .github/workflows/rust-stub.yml | 2 +- .github/workflows/rust.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust-stub.yml b/.github/workflows/rust-stub.yml index 9fa08b722e4..ef7590f23d4 100644 --- a/.github/workflows/rust-stub.yml +++ b/.github/workflows/rust-stub.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [buildjet-4vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [buildjet-6vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] steps: - run: 'echo "Not affected, skipping"' coverage: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index cccd869dd6a..56868a3c974 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [buildjet-4vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [buildjet-6vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] fail-fast: false steps: - uses: actions/checkout@v4 From a7c2da7f63e6e4ffb0c14d9025e6f50f42a8af1e Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 18 Oct 2023 22:56:37 -0700 Subject: [PATCH 3/8] Fixes. --- .github/workflows/rust-stub.yml | 2 +- .github/workflows/rust.yml | 2 +- scripts/release/setupNpm.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust-stub.yml b/.github/workflows/rust-stub.yml index ef7590f23d4..fb417fc1cae 100644 --- a/.github/workflows/rust-stub.yml +++ b/.github/workflows/rust-stub.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [buildjet-6vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [buildjet-8vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] steps: - run: 'echo "Not affected, skipping"' coverage: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 56868a3c974..89242d8cca4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [buildjet-6vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [buildjet-8vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/scripts/release/setupNpm.sh b/scripts/release/setupNpm.sh index 04fe32fe83f..4e556429047 100644 --- a/scripts/release/setupNpm.sh +++ b/scripts/release/setupNpm.sh @@ -13,7 +13,7 @@ if [ -d ".yarn/versions" ]; then fi if [[ "$NIGHTLY" == "true" ]]; then - timestamp=$(date +%Y%m%d.%H) + timestamp=$(date +%Y%m%d%H%M) preid="-nightly.$timestamp" echo "Nightly build detected, appending timestamp to versions" From c723afb4bc765a78e1485805a473d143fbad5fb8 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 18 Oct 2023 22:57:22 -0700 Subject: [PATCH 4/8] Test script. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e339ded75e5..95caf6cb1c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ on: schedule: - cron: '0 0 * * *' # Uncomment to test in PRs (its safe) - # pull_request: + pull_request: permissions: contents: write From 09018cdaac5e237b90b50bcf8d5d0be517a2adf5 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 18 Oct 2023 23:04:42 -0700 Subject: [PATCH 5/8] Update schematic. --- .github/workflows/release.yml | 4 +- .github/workflows/rust-stub.yml | 2 +- .github/workflows/rust.yml | 2 +- Cargo.lock | 109 ++++++++++++------------- Cargo.toml | 5 +- packages/types/src/project-config.ts | 4 +- packages/types/src/tasks-config.ts | 2 + packages/types/src/template-config.ts | 4 + packages/types/src/toolchain-config.ts | 10 +++ packages/types/src/workspace-config.ts | 2 + scripts/release/setupNpm.sh | 1 + website/static/schemas/project.json | 11 ++- website/static/schemas/tasks.json | 4 + website/static/schemas/toolchain.json | 4 + website/static/schemas/workspace.json | 5 ++ 15 files changed, 106 insertions(+), 63 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95caf6cb1c6..e7f9c716a23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,8 +28,8 @@ jobs: runs-on: ubuntu-latest outputs: publish: - ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || - contains(github.ref, 'develop-') }} + ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || + github.event_name == 'schedule' || contains(github.ref, 'develop-') }} nightly: ${{ steps.plan-step.outputs.nightly }} npm-channel: ${{ steps.plan-step.outputs.npm-channel }} steps: diff --git a/.github/workflows/rust-stub.yml b/.github/workflows/rust-stub.yml index fb417fc1cae..31f1a20522e 100644 --- a/.github/workflows/rust-stub.yml +++ b/.github/workflows/rust-stub.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [buildjet-8vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [ubuntu-latest, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] steps: - run: 'echo "Not affected, skipping"' coverage: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 89242d8cca4..43dbf542ef6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [buildjet-8vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [ubuntu-latest4, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index e10de59a7c0..c84f8b3fece 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,7 +322,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -366,7 +366,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -531,7 +531,7 @@ dependencies = [ "ahash 0.8.3", "cached_proc_macro", "cached_proc_macro_types", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "instant", "once_cell", "thiserror", @@ -839,7 +839,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1366,7 +1366,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1388,7 +1388,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1911,7 +1911,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1968,9 +1968,9 @@ dependencies = [ [[package]] name = "garde" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae9eba929c46323014c5ec1adf6d2fa94d68ff1947c489c165fcd7f216b34f2" +checksum = "94320acdd9159591d0f8079eb347fb52c2ffbe206b5214f6f4d482f2866e4d91" dependencies = [ "compact_str", "garde_derive", @@ -1982,14 +1982,14 @@ dependencies = [ [[package]] name = "garde_derive" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da663fa0f4a2bb40b93ee1b2f77656276b999df3b88574ddafe51d72fc1dfdd9" +checksum = "c3c617dc2454b80bcf7232a47efccdbd7aee2acb2a92a332b3ea7398dcc7f31d" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2184,9 +2184,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ "ahash 0.8.3", "allocator-api2", @@ -2428,12 +2428,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -2918,7 +2918,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4218,7 +4218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "169e72192bc84493725bfca5d47da4ee2abc8acf155586d8127eb17f022497f4" dependencies = [ "ahash 0.8.3", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "parking_lot", "stable_deref_trait", ] @@ -4421,7 +4421,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4442,7 +4442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_derive", ] @@ -4652,9 +4652,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -5098,12 +5098,12 @@ dependencies = [ [[package]] name = "schematic" -version = "0.11.8" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b21a16b67839da14dc4c238a18687628123cd707a075c1716af39a0dbbe5b61" +checksum = "08761c5bd6339c7da88d9076553af0415df49a538111e2fcc92ebe808c5fee79" dependencies = [ "garde", - "indexmap 2.0.0", + "indexmap 2.0.2", "miette", "reqwest", "schemars", @@ -5120,22 +5120,22 @@ dependencies = [ [[package]] name = "schematic_macros" -version = "0.11.7" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cda999e66473ef3d9a430e87e441d1d4ab02b186d1c01de672f8a9f03690949" +checksum = "e42afd7352a9915f20bdce3e1bfb63030dedefce9d371db7b7b54a4960618797" dependencies = [ "convert_case", "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "schematic_types" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09211563f9c50c0f268d1b66ba8369af388decb160fe271159fd3c486bf3c215" +checksum = "62ef6073b16a3870336d3cbbc69ab15d3abb089afc0c53944866079aa2578f59" dependencies = [ "semver", "version_spec", @@ -5198,9 +5198,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -5217,13 +5217,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5232,7 +5232,7 @@ version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -5297,7 +5297,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -5326,7 +5326,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5542,7 +5542,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5684,9 +5684,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5883,7 +5883,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -6007,7 +6007,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -6092,7 +6092,7 @@ version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -6105,7 +6105,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -6120,11 +6120,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -6144,20 +6143,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -6686,7 +6685,7 @@ version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "semver", ] diff --git a/Cargo.toml b/Cargo.toml index 510000abc19..ab60dd6a81e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,8 @@ reqwest = { version = "0.11.22", default-features = false, features = [ "native-tls-vendored", ] } rustc-hash = "1.1.0" -schematic = { version = "0.11.8", default-features = false, features = [ +schematic = { version = "0.12.7", default-features = false, features = [ + "config", "schema", "url", "yaml", @@ -57,7 +58,7 @@ schematic = { version = "0.11.8", default-features = false, features = [ "type_warpgate", ] } semver = "1.0.19" -serde = { version = "1.0.188", features = ["derive", "rc"] } +serde = { version = "1.0.189", features = ["derive", "rc"] } serde_json = "1.0.107" serde_yaml = "0.9.25" starbase = "0.2.8" diff --git a/packages/types/src/project-config.ts b/packages/types/src/project-config.ts index 4b998b3b676..60abee7cd5b 100644 --- a/packages/types/src/project-config.ts +++ b/packages/types/src/project-config.ts @@ -4,7 +4,7 @@ import type { PartialTaskConfig, PlatformType, TaskConfig } from './tasks-config'; -export type DependencyScope = 'build' | 'development' | 'peer' | 'production'; +export type DependencyScope = 'build' | 'development' | 'peer' | 'production' | 'root'; export type DependencySource = 'explicit' | 'implicit'; @@ -77,6 +77,7 @@ export interface PartialProjectWorkspaceConfig { inheritedTasks?: PartialProjectWorkspaceInheritedTasksConfig | null; } +/** Docs: https://moonrepo.dev/docs/config/project */ export interface PartialProjectConfig { /** @default 'https://moonrepo.dev/schemas/project.json' */ $schema?: string | null; @@ -149,6 +150,7 @@ export interface ProjectWorkspaceConfig { inheritedTasks: ProjectWorkspaceInheritedTasksConfig; } +/** Docs: https://moonrepo.dev/docs/config/project */ export interface ProjectConfig { /** @default 'https://moonrepo.dev/schemas/project.json' */ $schema: string; diff --git a/packages/types/src/tasks-config.ts b/packages/types/src/tasks-config.ts index b0911365da4..e3daad4f76b 100644 --- a/packages/types/src/tasks-config.ts +++ b/packages/types/src/tasks-config.ts @@ -50,6 +50,7 @@ export interface PartialTaskConfig { type?: TaskType | null; } +/** Docs: https://moonrepo.dev/docs/config/tasks */ export interface PartialInheritedTasksConfig { /** @default 'https://moonrepo.dev/schemas/tasks.json' */ $schema?: string | null; @@ -96,6 +97,7 @@ export interface TaskConfig { type: TaskType | null; } +/** Docs: https://moonrepo.dev/docs/config/tasks */ export interface InheritedTasksConfig { /** @default 'https://moonrepo.dev/schemas/tasks.json' */ $schema: string; diff --git a/packages/types/src/template-config.ts b/packages/types/src/template-config.ts index f2f22f67d71..5d6970d2a70 100644 --- a/packages/types/src/template-config.ts +++ b/packages/types/src/template-config.ts @@ -44,6 +44,7 @@ export type PartialTemplateVariable = | PartialTemplateVariableNumberSetting | PartialTemplateVariableStringSetting; +/** Docs: https://moonrepo.dev/docs/config/template */ export interface PartialTemplateConfig { /** @default 'https://moonrepo.dev/schemas/template.json' */ $schema?: string | null; @@ -52,6 +53,7 @@ export interface PartialTemplateConfig { variables?: Record | null; } +/** Docs: https://moonrepo.dev/docs/config/template#frontmatter */ export interface PartialTemplateFrontmatterConfig { /** @default 'https://moonrepo.dev/schemas/template-frontmatter.json' */ $schema?: string | null; @@ -102,6 +104,7 @@ export type TemplateVariable = | TemplateVariableNumberSetting | TemplateVariableStringSetting; +/** Docs: https://moonrepo.dev/docs/config/template */ export interface TemplateConfig { /** @default 'https://moonrepo.dev/schemas/template.json' */ $schema: string; @@ -110,6 +113,7 @@ export interface TemplateConfig { variables: Record; } +/** Docs: https://moonrepo.dev/docs/config/template#frontmatter */ export interface TemplateFrontmatterConfig { /** @default 'https://moonrepo.dev/schemas/template-frontmatter.json' */ $schema: string; diff --git a/packages/types/src/toolchain-config.ts b/packages/types/src/toolchain-config.ts index 35a79ae7a0a..a60d7507e7a 100644 --- a/packages/types/src/toolchain-config.ts +++ b/packages/types/src/toolchain-config.ts @@ -11,6 +11,7 @@ export interface PartialBinConfig { export type PartialBinEntry = string | PartialBinConfig; +/** Docs: https://moonrepo.dev/docs/config/toolchain#deno */ export interface PartialDenoConfig { bins?: PartialBinEntry[] | null; /** @default 'deps.ts' */ @@ -52,6 +53,7 @@ export interface PartialYarnConfig { version?: string | null; } +/** Docs: https://moonrepo.dev/docs/config/toolchain#node */ export interface PartialNodeConfig { /** @default true */ addEnginesConstraint?: boolean | null; @@ -72,6 +74,7 @@ export interface PartialNodeConfig { yarn?: PartialYarnConfig | null; } +/** Docs: https://moonrepo.dev/docs/config/toolchain#rust */ export interface PartialRustConfig { bins?: PartialBinEntry[] | null; plugin?: string | null; @@ -79,6 +82,7 @@ export interface PartialRustConfig { version?: string | null; } +/** Docs: https://moonrepo.dev/docs/config/toolchain#typescript */ export interface PartialTypeScriptConfig { /** @default true */ createMissingConfig?: boolean | null; @@ -94,6 +98,7 @@ export interface PartialTypeScriptConfig { syncProjectReferencesToPaths?: boolean | null; } +/** Docs: https://moonrepo.dev/docs/config/toolchain */ export interface PartialToolchainConfig { /** @default 'https://moonrepo.dev/schemas/toolchain.json' */ $schema?: string | null; @@ -113,6 +118,7 @@ export interface BinConfig { export type BinEntry = string | BinConfig; +/** Docs: https://moonrepo.dev/docs/config/toolchain#deno */ export interface DenoConfig { bins: BinEntry[]; /** @default 'deps.ts' */ @@ -137,6 +143,7 @@ export interface YarnConfig { version: string | null; } +/** Docs: https://moonrepo.dev/docs/config/toolchain#node */ export interface NodeConfig { /** @default true */ addEnginesConstraint: boolean; @@ -157,6 +164,7 @@ export interface NodeConfig { yarn: YarnConfig | null; } +/** Docs: https://moonrepo.dev/docs/config/toolchain#rust */ export interface RustConfig { bins: BinEntry[]; plugin: string | null; @@ -164,6 +172,7 @@ export interface RustConfig { version: string | null; } +/** Docs: https://moonrepo.dev/docs/config/toolchain#typescript */ export interface TypeScriptConfig { /** @default true */ createMissingConfig: boolean; @@ -179,6 +188,7 @@ export interface TypeScriptConfig { syncProjectReferencesToPaths: boolean; } +/** Docs: https://moonrepo.dev/docs/config/toolchain */ export interface ToolchainConfig { /** @default 'https://moonrepo.dev/schemas/toolchain.json' */ $schema: string; diff --git a/packages/types/src/workspace-config.ts b/packages/types/src/workspace-config.ts index 5b934093b13..f9fe00aa666 100644 --- a/packages/types/src/workspace-config.ts +++ b/packages/types/src/workspace-config.ts @@ -77,6 +77,7 @@ export interface PartialVcsConfig { syncHooks?: boolean | null; } +/** Docs: https://moonrepo.dev/docs/config/workspace */ export interface PartialWorkspaceConfig { /** @default 'https://moonrepo.dev/schemas/workspace.json' */ $schema?: string | null; @@ -157,6 +158,7 @@ export interface VcsConfig { syncHooks: boolean; } +/** Docs: https://moonrepo.dev/docs/config/workspace */ export interface WorkspaceConfig { /** @default 'https://moonrepo.dev/schemas/workspace.json' */ $schema: string; diff --git a/scripts/release/setupNpm.sh b/scripts/release/setupNpm.sh index 4e556429047..2fbb77cb00e 100644 --- a/scripts/release/setupNpm.sh +++ b/scripts/release/setupNpm.sh @@ -23,6 +23,7 @@ if [[ "$NIGHTLY" == "true" ]]; then echo "$package" cd "./$package" || exit pkg=$(jq ".version += \"$preid\"" package.json) + echo "$pkg" echo "$pkg" > package.json cd ../.. done diff --git a/website/static/schemas/project.json b/website/static/schemas/project.json index a3bccf3d09b..a1da3d967ce 100644 --- a/website/static/schemas/project.json +++ b/website/static/schemas/project.json @@ -166,15 +166,18 @@ "additionalProperties": false, "definitions": { "DependencyScope": { + "title": "DependencyScope", "type": "string", "enum": [ "build", "development", "peer", - "production" + "production", + "root" ] }, "DependencySource": { + "title": "DependencySource", "type": "string", "enum": [ "explicit", @@ -182,6 +185,7 @@ ] }, "LanguageType": { + "title": "LanguageType", "type": "string", "enum": [ "bash", @@ -898,6 +902,7 @@ "additionalProperties": false }, "PlatformType": { + "title": "PlatformType", "type": "string", "enum": [ "deno", @@ -908,6 +913,7 @@ ] }, "ProjectType": { + "title": "ProjectType", "type": "string", "enum": [ "application", @@ -917,6 +923,7 @@ ] }, "TaskMergeStrategy": { + "title": "TaskMergeStrategy", "type": "string", "enum": [ "append", @@ -951,6 +958,7 @@ ] }, "TaskOutputStyle": { + "title": "TaskOutputStyle", "type": "string", "enum": [ "buffer", @@ -961,6 +969,7 @@ ] }, "TaskType": { + "title": "TaskType", "type": "string", "enum": [ "build", diff --git a/website/static/schemas/tasks.json b/website/static/schemas/tasks.json index f2dd6195ae0..286f893bff4 100644 --- a/website/static/schemas/tasks.json +++ b/website/static/schemas/tasks.json @@ -416,6 +416,7 @@ "additionalProperties": false }, "PlatformType": { + "title": "PlatformType", "type": "string", "enum": [ "deno", @@ -426,6 +427,7 @@ ] }, "TaskMergeStrategy": { + "title": "TaskMergeStrategy", "type": "string", "enum": [ "append", @@ -460,6 +462,7 @@ ] }, "TaskOutputStyle": { + "title": "TaskOutputStyle", "type": "string", "enum": [ "buffer", @@ -470,6 +473,7 @@ ] }, "TaskType": { + "title": "TaskType", "type": "string", "enum": [ "build", diff --git a/website/static/schemas/toolchain.json b/website/static/schemas/toolchain.json index 7368b654dda..7755815b1aa 100644 --- a/website/static/schemas/toolchain.json +++ b/website/static/schemas/toolchain.json @@ -69,6 +69,7 @@ "additionalProperties": false, "definitions": { "NodePackageManager": { + "title": "NodePackageManager", "type": "string", "enum": [ "npm", @@ -77,6 +78,7 @@ ] }, "NodeProjectAliasFormat": { + "title": "NodeProjectAliasFormat", "type": "string", "enum": [ "name-and-scope", @@ -84,6 +86,7 @@ ] }, "NodeVersionFormat": { + "title": "NodeVersionFormat", "type": "string", "enum": [ "file", @@ -98,6 +101,7 @@ ] }, "NodeVersionManager": { + "title": "NodeVersionManager", "type": "string", "enum": [ "nodenv", diff --git a/website/static/schemas/workspace.json b/website/static/schemas/workspace.json index a4c052e2d00..894758790e7 100644 --- a/website/static/schemas/workspace.json +++ b/website/static/schemas/workspace.json @@ -140,6 +140,7 @@ "additionalProperties": false, "definitions": { "CodeownersOrderBy": { + "title": "CodeownersOrderBy", "type": "string", "enum": [ "file-source", @@ -147,6 +148,7 @@ ] }, "HasherOptimization": { + "title": "HasherOptimization", "type": "string", "enum": [ "accuracy", @@ -154,6 +156,7 @@ ] }, "HasherWalkStrategy": { + "title": "HasherWalkStrategy", "type": "string", "enum": [ "glob", @@ -565,12 +568,14 @@ "additionalProperties": false }, "VcsManager": { + "title": "VcsManager", "type": "string", "enum": [ "git" ] }, "VcsProvider": { + "title": "VcsProvider", "type": "string", "enum": [ "bitbucket", From 78f2c4038cdc5f4d2faa824dded7d8974b3d1542 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 18 Oct 2023 23:50:02 -0700 Subject: [PATCH 6/8] Polish. --- .github/workflows/release.yml | 6 +++--- .github/workflows/rust.yml | 2 +- scripts/release/setupNpm.sh | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7f9c716a23..e339ded75e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ on: schedule: - cron: '0 0 * * *' # Uncomment to test in PRs (its safe) - pull_request: + # pull_request: permissions: contents: write @@ -28,8 +28,8 @@ jobs: runs-on: ubuntu-latest outputs: publish: - ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || - github.event_name == 'schedule' || contains(github.ref, 'develop-') }} + ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || + contains(github.ref, 'develop-') }} nightly: ${{ steps.plan-step.outputs.nightly }} npm-channel: ${{ steps.plan-step.outputs.npm-channel }} steps: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 43dbf542ef6..3fdf3552956 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest4, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [ubuntu-latest, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/scripts/release/setupNpm.sh b/scripts/release/setupNpm.sh index 2fbb77cb00e..4e556429047 100644 --- a/scripts/release/setupNpm.sh +++ b/scripts/release/setupNpm.sh @@ -23,7 +23,6 @@ if [[ "$NIGHTLY" == "true" ]]; then echo "$package" cd "./$package" || exit pkg=$(jq ".version += \"$preid\"" package.json) - echo "$pkg" echo "$pkg" > package.json cd ../.. done From 58fcacd266ecd9702e3fb1bc341af7d7a50267f8 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 18 Oct 2023 23:54:04 -0700 Subject: [PATCH 7/8] Fix versions. --- .yarn/versions/07432d6e.yml | 6 ------ .yarn/versions/d7681574.yml | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .yarn/versions/d7681574.yml diff --git a/.yarn/versions/07432d6e.yml b/.yarn/versions/07432d6e.yml index 78482dc670d..beecc3e11e7 100644 --- a/.yarn/versions/07432d6e.yml +++ b/.yarn/versions/07432d6e.yml @@ -7,9 +7,3 @@ releases: '@moonrepo/core-macos-arm64': patch '@moonrepo/core-macos-x64': patch '@moonrepo/core-windows-x64-msvc': patch - '@moonrepo/types': patch - -declined: - - '@moonrepo/report' - - '@moonrepo/runtime' - - website diff --git a/.yarn/versions/d7681574.yml b/.yarn/versions/d7681574.yml new file mode 100644 index 00000000000..dd5b7417e7c --- /dev/null +++ b/.yarn/versions/d7681574.yml @@ -0,0 +1,7 @@ +releases: + '@moonrepo/types': patch + +declined: + - '@moonrepo/report' + - '@moonrepo/runtime' + - website From caf9f5719178f4b5b11762775eb8e252293c460a Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Thu, 19 Oct 2023 00:10:42 -0700 Subject: [PATCH 8/8] More changes. --- .github/workflows/rust-stub.yml | 2 +- .github/workflows/rust.yml | 2 +- .yarn/versions/07432d6e.yml | 9 --------- .yarn/versions/d7681574.yml | 8 ++++++++ 4 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 .yarn/versions/07432d6e.yml diff --git a/.github/workflows/rust-stub.yml b/.github/workflows/rust-stub.yml index 31f1a20522e..fb417fc1cae 100644 --- a/.github/workflows/rust-stub.yml +++ b/.github/workflows/rust-stub.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [buildjet-8vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] steps: - run: 'echo "Not affected, skipping"' coverage: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3fdf3552956..89242d8cca4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] + os: [buildjet-8vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/.yarn/versions/07432d6e.yml b/.yarn/versions/07432d6e.yml deleted file mode 100644 index beecc3e11e7..00000000000 --- a/.yarn/versions/07432d6e.yml +++ /dev/null @@ -1,9 +0,0 @@ -releases: - '@moonrepo/cli': patch - '@moonrepo/core-linux-arm64-gnu': patch - '@moonrepo/core-linux-arm64-musl': patch - '@moonrepo/core-linux-x64-gnu': patch - '@moonrepo/core-linux-x64-musl': patch - '@moonrepo/core-macos-arm64': patch - '@moonrepo/core-macos-x64': patch - '@moonrepo/core-windows-x64-msvc': patch diff --git a/.yarn/versions/d7681574.yml b/.yarn/versions/d7681574.yml index dd5b7417e7c..78482dc670d 100644 --- a/.yarn/versions/d7681574.yml +++ b/.yarn/versions/d7681574.yml @@ -1,4 +1,12 @@ releases: + '@moonrepo/cli': patch + '@moonrepo/core-linux-arm64-gnu': patch + '@moonrepo/core-linux-arm64-musl': patch + '@moonrepo/core-linux-x64-gnu': patch + '@moonrepo/core-linux-x64-musl': patch + '@moonrepo/core-macos-arm64': patch + '@moonrepo/core-macos-x64': patch + '@moonrepo/core-windows-x64-msvc': patch '@moonrepo/types': patch declined: