tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-25 06:35:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: bump freebsd-vm to v1.2.0 (#1730)

Browse Source 
* ci: bump freebsd-vm to v1.2.0

* also bump freebsd versions

* oops it was clippy

* fix ci pass check
This commit is contained in:
Clement Tsang 2025-05-25 20:59:31 -04:00 committed by GitHub
parent 7e0c6aa286
commit b2506e5e85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build_releases.yml vendored
View File

@ -228,8 +228,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
info: info:
# Seems like cross' FreeBSD image is a bit broken? I get build errors, may be related to this issue: # Seems like cross's FreeBSD image is a bit broken? I get build errors,
# https://github.com/cross-rs/cross/issues/1291 # may be related to this issue: https://github.com/cross-rs/cross/issues/1291
# #
# Alas, that's why we do it with VMs. # Alas, that's why we do it with VMs.
- { - {
@ -239,12 +239,12 @@ jobs:
} }
- { - {
type: "freebsd", type: "freebsd",
os_release: "14.1", os_release: "14.2",
target: "x86_64-unknown-freebsd", target: "x86_64-unknown-freebsd",
} }
- { - {
type: "freebsd", type: "freebsd",
os_release: "13.3", os_release: "13.5",
target: "x86_64-unknown-freebsd", target: "x86_64-unknown-freebsd",
} }
steps: steps:
@ -256,7 +256,7 @@ jobs:
- name: Build (FreeBSD) - name: Build (FreeBSD)
if: ${{ matrix.info.type == 'freebsd' }} if: ${{ matrix.info.type == 'freebsd' }}
uses: vmactions/freebsd-vm@debf37ca7b7fa40e19c542ef7ba30d6054a706a4 # v1.1.5 uses: vmactions/freebsd-vm@c3ae29a132c8ef1924775414107a97cac042aad5 # v1.2.0
with: with:
release: "${{ matrix.info.os_release }}" release: "${{ matrix.info.os_release }}"
envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS COMPLETION_DIR MANPAGE_DIR" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS COMPLETION_DIR MANPAGE_DIR"

18
.github/workflows/ci.yml vendored
View File

@ -274,8 +274,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
info: info:
# Seems like cross' FreeBSD image is a bit broken? I get build errors, may be related to this issue: # Seems like cross's FreeBSD image is a bit broken? I get build errors,
# https://github.com/cross-rs/cross/issues/1291 # may be related to this issue: https://github.com/cross-rs/cross/issues/1291
# #
# Alas, that's why we do it with VMs. # Alas, that's why we do it with VMs.
- { - {
@ -285,12 +285,12 @@ jobs:
} }
- { - {
type: "freebsd", type: "freebsd",
os_release: "14.1", os_release: "14.2",
target: "x86_64-unknown-freebsd", target: "x86_64-unknown-freebsd",
} }
- { - {
type: "freebsd", type: "freebsd",
os_release: "13.3", os_release: "13.5",
target: "x86_64-unknown-freebsd", target: "x86_64-unknown-freebsd",
} }
steps: steps:
@ -308,7 +308,7 @@ jobs:
- name: Clippy (FreeBSD) - name: Clippy (FreeBSD)
if: ${{ matrix.info.type == 'freebsd' }} if: ${{ matrix.info.type == 'freebsd' }}
uses: vmactions/freebsd-vm@debf37ca7b7fa40e19c542ef7ba30d6054a706a4 # v1.1.5 uses: vmactions/freebsd-vm@c3ae29a132c8ef1924775414107a97cac042aad5 # v1.2.0
with: with:
release: "${{ matrix.info.os_release }}" release: "${{ matrix.info.os_release }}"
envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS" envs: "RUST_BACKTRACE CARGO_INCREMENTAL CARGO_PROFILE_DEV_DEBUG CARGO_HUSKY_DONT_INSTALL_HOOKS"
@ -324,22 +324,22 @@ jobs:
completion: completion:
name: "CI Pass Check" name: "CI Pass Check"
needs: [supported, other-check, vm-check] needs: [supported, other-check, vm-check]
if: ${{ needs.supported.result != 'skipped' && needs.other-check.result != 'skipped' && needs.vm-check.result != 'skipped' }} if: ${{ needs.supported.result != 'skipped' || needs.other-check.result != 'skipped' || needs.vm-check.result != 'skipped' }}
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- name: CI Passed - name: CI Passed
if: ${{ needs.supported.result == 'success' && needs.other-check.result == 'success' && needs.vm-check.result == 'success' }} if: ${{ (needs.supported.result == 'success' || needs.supported.result == 'skipped') && (needs.other-check.result == 'success' || needs.other-check.result == 'skipped') && (needs.vm-check.result == 'success' || needs.vm-check.result == 'skipped') }}
run: | run: |
echo "CI workflow completed successfully."; echo "CI workflow completed successfully.";
- name: CI Failed - name: CI Failed
if: ${{ needs.supported.result == 'failure' && needs.other-check.result == 'failure' && needs.vm-check.result == 'failure' }} if: ${{ needs.supported.result == 'failure' || needs.other-check.result == 'failure' || needs.vm-check.result == 'failure' }}
run: | run: |
echo "CI workflow failed."; echo "CI workflow failed.";
exit 1; exit 1;
- name: CI Cancelled - name: CI Cancelled
if: ${{ needs.supported.result == 'cancelled' && needs.other-check.result == 'cancelled' && needs.vm-check.result == 'cancelled' }} if: ${{ needs.supported.result == 'cancelled' || needs.other-check.result == 'cancelled' || needs.vm-check.result == 'cancelled' }}
run: | run: |
echo "CI workflow was cancelled."; echo "CI workflow was cancelled.";
exit 1; exit 1;

2
src/collection.rs
View File

@ -539,6 +539,6 @@ where
value value
.as_object_mut() .as_object_mut()
.and_then(|map| map.remove(key)) .and_then(|map| map.remove(key))
.ok_or_else(|| std::io::Error::new(std::io::ErrorKind::Other, "key not found")) .ok_or_else(|| std::io::Error::other("key not found"))
.and_then(|val| serde_json::from_value(val).map_err(|err| err.into())) .and_then(|val| serde_json::from_value(val).map_err(|err| err.into()))
} }