From ddaa8444cf3e59dfa81176243536bdfec9cea114 Mon Sep 17 00:00:00 2001 From: Tyler Cook <10459406+cilki@users.noreply.github.com> Date: Sun, 17 Mar 2024 15:12:13 -0500 Subject: [PATCH] wip: add missing fields to Cargo.toml --- .github/workflows/check.yml | 9 ++- .github/workflows/publish.yml | 31 ---------- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 12 ++-- Cargo.lock | 104 ++++++++++++++++++---------------- goldboot-macros/Cargo.toml | 3 + 6 files changed, 74 insertions(+), 87 deletions(-) delete mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 2ad092a..2b9519b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,6 +5,7 @@ # - doc: checks that the code can be documented without errors # - hack: check combinations of feature flags # - msrv: check that the msrv specified in the crate is correct +name: check permissions: contents: read # This configuration allows maintainers of this repo to create a branch and pull request based on @@ -19,10 +20,10 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true -name: check jobs: fmt: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" name: stable / fmt steps: - uses: actions/checkout@v4 @@ -36,6 +37,7 @@ jobs: run: cargo fmt --check clippy: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" name: ${{ matrix.toolchain }} / clippy permissions: contents: read @@ -64,9 +66,10 @@ jobs: # https://doc.rust-lang.org/beta/unstable-book/language-features/doc-cfg.html which allows an # API be documented as only available in some specific platforms. runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" name: nightly / doc steps: - - run: apt-get install -y libpango-1.0-0 + - run: sudo apt-get install -y libpango-1.0-0 - uses: actions/checkout@v4 with: submodules: true @@ -80,6 +83,7 @@ jobs: # cargo-hack checks combinations of feature flags to ensure that features are all additive # which is required for feature unification runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" name: ubuntu / stable / features steps: - uses: actions/checkout@v4 @@ -96,6 +100,7 @@ jobs: msrv: # check that we can build using the minimal rust version that is specified by this crate runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" # we use a matrix here just because env can't be used in job names # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability strategy: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 2636c88..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,31 +0,0 @@ -on: - push: - tags: - - "*" - -jobs: - publish: - name: Publish release - runs-on: ubuntu-latest - steps: - - name: Download release - uses: dawidd6/action-download-artifact@v2 - with: - workflow: build.yml - path: . - - - name: Assemble release - run: | - ls -l - mkdir release - cp goldboot-x86_64-unknown-linux-gnu/goldboot release/goldboot-x86_64-unknown-linux-gnu - cp goldboot-linux-x86_64-unknown-linux-gnu/goldboot-linux release/goldboot-linux-x86_64-unknown-linux-gnu - - cp goldboot-x86_64-apple-darwin/goldboot release/goldboot-x86_64-apple-darwin - - cp goldboot-x86_64-pc-windows-msvc/goldboot release/goldboot-x86_64-pc-windows-msvc - - - name: Create release - uses: softprops/action-gh-release@v1 - with: - files: release/* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3aa45b2..e210a4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ +name: release permissions: pull-requests: write contents: write - on: push: branches: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f9c9a63..9e91187 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,7 @@ # - os-check: runs the test suite on mac and windows # - coverage: runs the test suite and collects coverage information # See check.yml for information about how the concurrency cancellation and workflow triggering works +name: test permissions: contents: read on: @@ -15,10 +16,10 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true -name: test jobs: required: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" name: ubuntu / ${{ matrix.toolchain }} strategy: matrix: @@ -26,7 +27,7 @@ jobs: # toolchain toolchain: [stable, beta] steps: - - run: apt-get install -y libpango-1.0-0 + - run: sudo apt-get install -y libpango-1.0-0 - uses: actions/checkout@v4 with: submodules: true @@ -68,9 +69,10 @@ jobs: # https://github.com/jonhoo/fantoccini/blob/fde336472b712bc7ebf5b4e772023a7ba71b2262/Cargo.toml#L47-L49. # This action is run on ubuntu with the stable toolchain, as it is not expected to fail runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" name: ubuntu / stable / minimal-versions steps: - - run: apt-get install -y libpango-1.0-0 + - run: sudo apt-get install -y libpango-1.0-0 - uses: actions/checkout@v4 with: submodules: true @@ -87,6 +89,7 @@ jobs: os-check: # run cargo test on mac and windows runs-on: ${{ matrix.os }} + if: "!contains(github.event.head_commit.message, 'chore: release')" name: ${{ matrix.os }} / stable strategy: fail-fast: false @@ -132,9 +135,10 @@ jobs: # # for lots of more discussion runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'chore: release')" name: ubuntu / stable / coverage steps: - - run: apt-get install -y libpango-1.0-0 + - run: sudo apt-get install -y libpango-1.0-0 - uses: actions/checkout@v4 with: submodules: true diff --git a/Cargo.lock b/Cargo.lock index b2ad68b..b01b7e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,13 +155,13 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -356,7 +356,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", "syn_derive", ] @@ -413,9 +413,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -530,9 +530,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.2" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -552,14 +552,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -683,7 +683,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -707,7 +707,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -718,7 +718,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -840,7 +840,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1055,7 +1055,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1254,11 +1254,11 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1366,7 +1366,7 @@ name = "goldboot-macros" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1490,9 +1490,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -1509,9 +1509,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" dependencies = [ "bytes", "fnv", @@ -1547,6 +1547,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -1652,7 +1658,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", + "h2 0.3.25", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -1675,7 +1681,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.2", + "h2 0.4.3", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -2137,7 +2143,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2332,7 +2338,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2625,7 +2631,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.24", + "h2 0.3.25", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", @@ -2923,7 +2929,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2980,9 +2986,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.32" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ "indexmap", "itoa", @@ -3202,7 +3208,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -3215,11 +3221,11 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3241,9 +3247,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -3259,7 +3265,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3291,12 +3297,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "e8e9199467bcbc77c6a13cc6e32a6af21721ab8c96aa0261856c4fda5a4433f0" dependencies = [ "cfg-expr", - "heck", + "heck 0.4.1", "pkg-config", "toml 0.8.11", "version-compare", @@ -3365,7 +3371,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3420,7 +3426,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3590,7 +3596,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3708,9 +3714,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -3778,7 +3784,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3858,7 +3864,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", "wasm-bindgen-shared", ] @@ -3892,7 +3898,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/goldboot-macros/Cargo.toml b/goldboot-macros/Cargo.toml index a6d9cff..228510b 100644 --- a/goldboot-macros/Cargo.toml +++ b/goldboot-macros/Cargo.toml @@ -3,6 +3,9 @@ name = "goldboot-macros" version = "0.0.1" edition = "2021" rust-version = "1.70" +description = "Supporting macros for goldboot" +license = "AGPL-3.0-only" +authors = ["Tyler Cook"] [lib] proc-macro = true