mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: bump shellcheck to 0.9.0, fix new SC2016 warnings

Browse Source 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2023-06-06 17:39:47 -07:00
parent 1bc2999b77
commit 5e53e6592a
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/validate.yml
+2 -2
View File
@@ -83,9 +83,9 @@ jobs:
- uses: actions/checkout@v3
- name: install shellcheck
env:
VERSION: v0.8.0
VERSION: v0.9.0
BASEURL: https://github.com/koalaman/shellcheck/releases/download
SHA256: f4bce23c11c3919c1b20bcb0f206f6b44c44e26f2bc95f8aa708716095fa0651
SHA256: 7087178d54de6652b404c306233264463cb9e7a9afeb259bb663cc4dbfd64149
run: |
mkdir ~/bin
curl -sSfL --retry 5 $BASEURL/$VERSION/shellcheck-$VERSION.linux.x86_64.tar.xz |
tests/integration/helpers.bash
+1 -1
View File
@@ -287,7 +287,7 @@ function check_cpu_quota() {
fi
check_cgroup_value "cpu.max" "$quota $period"
else
check_cgroup_value "cpu.cfs_quota_us" $quota
check_cgroup_value "cpu.cfs_quota_us" "$quota"
check_cgroup_value "cpu.cfs_period_us" "$period"
fi
# systemd values are the same for v1 and v2
tests/integration/hooks.bats
+5 -5
View File
@@ -14,9 +14,9 @@ function setup() {
function teardown() {
if [ -v LIBPATH ]; then
umount "$LIBPATH"/$HOOKLIBCR.1.0.0 &>/dev/null || true
umount "$LIBPATH"/$HOOKLIBCC.1.0.0 &>/dev/null || true
rm -f $HOOKLIBCR.1.0.0 $HOOKLIBCC.1.0.0
umount "$LIBPATH/$HOOKLIBCR".1.0.0 &>/dev/null || true
umount "$LIBPATH/$HOOKLIBCC".1.0.0 &>/dev/null || true
rm -f "$HOOKLIBCR".1.0.0 "$HOOKLIBCC".1.0.0
unset LIBPATH HOOKLIBCR HOOKLIBCC
fi
teardown_bundle
@@ -52,8 +52,8 @@ function teardown() {
[ "$status" -eq 0 ]
echo "Checking create-runtime library"
echo "$output" | grep $HOOKLIBCR
echo "$output" | grep "$HOOKLIBCR"
echo "Checking create-container library"
echo "$output" | grep $HOOKLIBCC
echo "$output" | grep "$HOOKLIBCC"
}
tests/integration/update.bats
+6 -6
View File
@@ -99,8 +99,8 @@ function setup() {
# try to remove memory swap limit
runc update test_update --memory-swap -1
[ "$status" -eq 0 ]
check_cgroup_value "$MEM_SWAP" $SYSTEM_MEM
check_systemd_value "$SD_MEM_SWAP" $SD_UNLIMITED
check_cgroup_value "$MEM_SWAP" "$SYSTEM_MEM"
check_systemd_value "$SD_MEM_SWAP" "$SD_UNLIMITED"
# update memory swap
if [ -v CGROUP_V2 ]; then
@@ -123,13 +123,13 @@ function setup() {
[ "$status" -eq 0 ]
# check memory limit is gone
check_cgroup_value $MEM_LIMIT $SYSTEM_MEM
check_systemd_value $SD_MEM_LIMIT $SD_UNLIMITED
check_cgroup_value "$MEM_LIMIT" "$SYSTEM_MEM"
check_systemd_value "$SD_MEM_LIMIT" "$SD_UNLIMITED"
# check swap memory limited is gone
if [ "$HAVE_SWAP" = "yes" ]; then
check_cgroup_value $MEM_SWAP $SYSTEM_MEM
check_systemd_value "$SD_MEM_SWAP" $SD_UNLIMITED
check_cgroup_value "$MEM_SWAP" "$SYSTEM_MEM"
check_systemd_value "$SD_MEM_SWAP" "$SD_UNLIMITED"
fi
# update pids limit