Skip to content

Commit bd4d05c

Browse files
author
Mrunal Patel
authored
Merge pull request #3640 from kolyshkin/1.1-bump-shellcheck
[1.1] ci: shellcheck: update to 0.8.0, fix/suppress new warnings
2 parents 974efd2 + e6a8287 commit bd4d05c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/validate.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ jobs:
102102
- uses: actions/checkout@v3
103103
- name: vars
104104
run: |
105-
echo 'VERSION=v0.7.2' >> $GITHUB_ENV
105+
echo 'VERSION=v0.8.0' >> $GITHUB_ENV
106106
echo 'BASEURL=https://github.com/koalaman/shellcheck/releases/download' >> $GITHUB_ENV
107-
echo 'SHA256SUM=12ee2e0b90a3d1e9cae24ac9b2838be66b48573cb2c8e8f3c566b959df6f050c' >> $GITHUB_ENV
107+
echo 'SHA256SUM=f4bce23c11c3919c1b20bcb0f206f6b44c44e26f2bc95f8aa708716095fa0651' >> $GITHUB_ENV
108108
echo ~/bin >> $GITHUB_PATH
109109
- name: install shellcheck
110110
run: |

tests/integration/events.bats

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ function teardown() {
1010
teardown_bundle
1111
}
1212

13+
# shellcheck disable=SC2030
1314
@test "events --stats" {
1415
# XXX: currently cgroups require root containers.
1516
requires root
@@ -38,6 +39,7 @@ function test_events() {
3839
fi
3940

4041
runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
42+
# shellcheck disable=SC2031
4143
[ "$status" -eq 0 ]
4244

4345
# Spawn two subshels:

tests/integration/helpers.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TESTDATA="${INTEGRATION_ROOT}/testdata"
2626
# Kernel version
2727
KERNEL_VERSION="$(uname -r)"
2828
KERNEL_MAJOR="${KERNEL_VERSION%%.*}"
29-
KERNEL_MINOR="${KERNEL_VERSION#$KERNEL_MAJOR.}"
29+
KERNEL_MINOR="${KERNEL_VERSION#"$KERNEL_MAJOR".}"
3030
KERNEL_MINOR="${KERNEL_MINOR%%.*}"
3131

3232
ARCH=$(uname -m)

0 commit comments

Comments
 (0)