From 391c282cfa26ae3b3e582fd4698ac8e2a34bddaf Mon Sep 17 00:00:00 2001 From: mbround18 Date: Wed, 17 Jun 2026 12:37:59 -0700 Subject: [PATCH 1/2] Update CI --- .github/workflows/docker-build.yml | 14 +- .github/workflows/docker-release.yml | 16 +-- .github/workflows/enforce-labels.yml | 2 +- .github/workflows/release.yml | 10 +- Cargo.lock | 190 +-------------------------- 5 files changed, 26 insertions(+), 206 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 8cca38e0..da17e098 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -23,8 +23,8 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - uses: actions/setup-node@v6 - - uses: actions/checkout@v6 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # 48b55a0 (https://github.com/actions/setup-node/releases/tag/v6.4.0) + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # df4cb1c (https://github.com/actions/checkout/releases/tag/v6.0.3) - run: npx -y prettier --check ./ # Uncomment the line below to include shell script linting # - run: npx -y shellcheck ./.github/scripts/*.sh ./src/scripts/*.sh @@ -57,20 +57,20 @@ jobs: - image: valheim push: ${{ contains(github.event.pull_request.labels.*.name, 'canary') }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # df4cb1c (https://github.com/actions/checkout/releases/tag/v6.0.3) - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 + uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # d7f5e7f (https://github.com/docker/setup-buildx-action/releases/tag/v4.1.0) - name: Login to DockerHub - uses: docker/login-action@v4 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # 650006c (https://github.com/docker/login-action/releases/tag/v4.2.0) with: username: mbround18 password: ${{ secrets.DOCKER_TOKEN }} - name: Docker meta id: meta - uses: crazy-max/ghaction-docker-meta@v6 + uses: crazy-max/ghaction-docker-meta@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # 80c7e94 (https://github.com/crazy-max/ghaction-docker-meta/releases/tag/v6.1.0) with: images: | mbround18/${{ matrix.image }} @@ -79,7 +79,7 @@ jobs: - name: Build ${{ matrix.image }} id: docker_build - uses: docker/build-push-action@v7 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # f9f3042 (https://github.com/docker/build-push-action/releases/tag/v7.2.0) with: file: ./Dockerfile target: ${{ matrix.image }} diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 31d8c41c..0f85682d 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -18,12 +18,10 @@ jobs: steps: # Check out the repository - - uses: actions/checkout@v6 - - # Generate Docker metadata + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # df4cb1c (https://github.com/actions/checkout/releases/tag/v6.0.3) - name: Docker meta id: meta - uses: crazy-max/ghaction-docker-meta@v6 + uses: crazy-max/ghaction-docker-meta@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # 80c7e94 (https://github.com/crazy-max/ghaction-docker-meta/releases/tag/v6.1.0) with: images: | mbround18/${{ matrix.image }} @@ -39,11 +37,9 @@ jobs: # Set up Docker Buildx - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 - - # Log in to DockerHub + uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # d7f5e7f (https://github.com/docker/setup-buildx-action/releases/tag/v4.1.0) - name: Login to DockerHub - uses: docker/login-action@v4 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # 650006c (https://github.com/docker/login-action/releases/tag/v4.2.0) with: username: mbround18 password: ${{ secrets.DOCKER_TOKEN }} @@ -51,7 +47,7 @@ jobs: # Log in to GitHub Container Registry - name: Login to GitHub Container Registry if: github.event_name != 'pull_request' - uses: docker/login-action@v4 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # 650006c (https://github.com/docker/login-action/releases/tag/v4.2.0) with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -63,7 +59,7 @@ jobs: # Build and push Docker images - name: Build and push - uses: docker/build-push-action@v7 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # f9f3042 (https://github.com/docker/build-push-action/releases/tag/v7.2.0) with: context: . file: ./Dockerfile diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml index a7743920..d33bfb67 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.github/workflows/enforce-labels.yml @@ -12,7 +12,7 @@ jobs: enforce-label: runs-on: ubuntu-latest steps: - - uses: yogevbd/enforce-label-action@2.2.2 + - uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # a3c219d (https://github.com/yogevbd/enforce-label-action/releases/tag/2.2.2) with: REQUIRED_LABELS_ANY: "major,minor,patch,internal,performance,question,release,tests,wontfix,documentation,bug,dependencies" REQUIRED_LABELS_ANY_DESCRIPTION: "Select at least one label ['major','minr','patch', 'documentation']" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8259891..1a97bb79 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,20 +16,20 @@ jobs: if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')" steps: # Check out the repository - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # df4cb1c (https://github.com/actions/checkout/releases/tag/v6.0.3) with: fetch-depth: 0 token: "${{ secrets.GH_TOKEN }}" # Set up Rust with the stable toolchain - name: Setup | Rust | Stable - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@46268bd060767258de96ed93c1251119784f2ab6 # 46268bd (https://github.com/actions-rust-lang/setup-rust-toolchain/releases/tag/v1.16.1) with: toolchain: stable components: clippy rustfmt # Cache Cargo build files to speed up builds - - uses: actions/cache@v5 + - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # 27d5ce7 (https://github.com/actions/cache/releases/tag/v5.0.5) name: Cache Cargo Files with: path: | @@ -42,13 +42,13 @@ jobs: run: make release PROFILE=production # Create a ZIP archive of the release binaries - - uses: vimtor/action-zip@v1 + - uses: vimtor/action-zip@5407800dfb2b1b37d48df912330cb22f4ab6f422 # 5407800 (https://github.com/vimtor/action-zip/releases/tag/v1.3) with: files: target/release/odin target/release/huginn dest: tmp/bundle.zip # Use the Auto Release Tool by Intuit - name: Auto Release Tool by Intuit - uses: mbround18/auto@v1.5.0 + uses: mbround18/auto@52c63af059a94fee4575f83bfc6ea0f35866b3b8 # 52c63af (https://github.com/mbround18/auto/releases/tag/v1.5.0) with: token: ${{ secrets.GH_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index c1be6554..08af478a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -736,12 +736,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -880,17 +874,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi 6.0.0", "rand_core 0.10.1", - "wasip2", - "wasip3", "wasm-bindgen", ] @@ -941,15 +933,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", -] - [[package]] name = "hashbrown" version = "0.16.1" @@ -958,7 +941,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", - "foldhash 0.2.0", + "foldhash", ] [[package]] @@ -1250,12 +1233,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "ident_case" version = "1.0.1" @@ -1428,12 +1405,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libbz2-rs-sys" version = "0.2.5" @@ -2025,16 +1996,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "proc-macro2" version = "1.0.106" @@ -2082,7 +2043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20", - "getrandom 0.4.2", + "getrandom 0.4.3", "rand_core 0.10.1", ] @@ -2626,7 +2587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.4.3", "once_cell", "rustix", "windows-sys 0.61.2", @@ -2970,12 +2931,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "url" version = "2.5.8" @@ -3078,16 +3033,7 @@ version = "1.0.4+wasi-0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", + "wit-bindgen", ] [[package]] @@ -3145,40 +3091,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap 2.14.0", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap 2.14.0", - "semver", -] - [[package]] name = "web-sys" version = "0.3.102" @@ -3432,100 +3344,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap 2.14.0", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap 2.14.0", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.14.0", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "writeable" version = "0.6.3" @@ -3657,7 +3481,7 @@ dependencies = [ "crc32fast", "deflate64", "flate2", - "getrandom 0.4.2", + "getrandom 0.4.3", "hmac", "indexmap 2.14.0", "lzma-rust2", From d835c0a0908dfb822ab160b0876dea3bf7117c7f Mon Sep 17 00:00:00 2001 From: mbround18 Date: Wed, 17 Jun 2026 12:44:24 -0700 Subject: [PATCH 2/2] Fix checks --- .github/workflows/docker-build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index da17e098..8583abd3 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -3,8 +3,10 @@ name: Build & Check on: pull_request: types: + - opened - labeled - edited + - reopened - synchronize - unlabeled branches: @@ -42,10 +44,10 @@ jobs: build_rust: name: Build Rust - uses: mbround18/gh-reusable/.github/workflows/rust-build-n-test.yml@main + uses: mbround18/gh-reusable/.github/workflows/rust-build-n-test.yaml@main build_docker: - name: "Build Docker" + name: Build Docker (${{ matrix.image }}) runs-on: ubuntu-latest strategy: fail-fast: true