Compare commits
No commits in common. "70d6ed41f904b8332a22e967911bdb8b718e39d3" and "2f129f19b31023340856f3a1a499c18f36cccb42" have entirely different histories.
70d6ed41f9
...
2f129f19b3
2
.github/workflows/test_set_2.yml
vendored
2
.github/workflows/test_set_2.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
|||||||
if: github.repository_owner == 'hwdsl2'
|
if: github.repository_owner == 'hwdsl2'
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os_version: ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:18.04", "debian:12", "debian:11", "debian:10", "alpine:3.17", "alpine:3.16"]
|
os_version: ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:18.04", "debian:bookworm", "debian:11", "debian:10", "alpine:3.17", "alpine:3.16"]
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
container:
|
container:
|
||||||
image: ${{ matrix.os_version }}
|
image: ${{ matrix.os_version }}
|
||||||
|
@ -93,8 +93,6 @@ check_os() {
|
|||||||
elif grep -qs "Amazon Linux release 2 " /etc/system-release; then
|
elif grep -qs "Amazon Linux release 2 " /etc/system-release; then
|
||||||
os_type=amzn
|
os_type=amzn
|
||||||
os_ver=2
|
os_ver=2
|
||||||
elif grep -qs "Amazon Linux release 2023" /etc/system-release; then
|
|
||||||
exiterr "Amazon Linux 2023 is not supported."
|
|
||||||
else
|
else
|
||||||
os_type=$(lsb_release -si 2>/dev/null)
|
os_type=$(lsb_release -si 2>/dev/null)
|
||||||
[ -z "$os_type" ] && [ -f /etc/os-release ] && os_type=$(. /etc/os-release && printf '%s' "$ID")
|
[ -z "$os_type" ] && [ -f /etc/os-release ] && os_type=$(. /etc/os-release && printf '%s' "$ID")
|
||||||
|
@ -93,8 +93,6 @@ check_os() {
|
|||||||
elif grep -qs "Amazon Linux release 2 " /etc/system-release; then
|
elif grep -qs "Amazon Linux release 2 " /etc/system-release; then
|
||||||
os_type=amzn
|
os_type=amzn
|
||||||
os_ver=2
|
os_ver=2
|
||||||
elif grep -qs "Amazon Linux release 2023" /etc/system-release; then
|
|
||||||
exiterr "Amazon Linux 2023 is not supported."
|
|
||||||
else
|
else
|
||||||
os_type=$(lsb_release -si 2>/dev/null)
|
os_type=$(lsb_release -si 2>/dev/null)
|
||||||
[ -z "$os_type" ] && [ -f /etc/os-release ] && os_type=$(. /etc/os-release && printf '%s' "$ID")
|
[ -z "$os_type" ] && [ -f /etc/os-release ] && os_type=$(. /etc/os-release && printf '%s' "$ID")
|
||||||
|
@ -54,11 +54,7 @@ check_root() {
|
|||||||
|
|
||||||
check_os() {
|
check_os() {
|
||||||
if ! grep -qs "Amazon Linux release 2 " /etc/system-release; then
|
if ! grep -qs "Amazon Linux release 2 " /etc/system-release; then
|
||||||
if grep -qs "Amazon Linux release 2023" /etc/system-release; then
|
exiterr "This script only supports Amazon Linux 2."
|
||||||
exiterr "Amazon Linux 2023 is not supported."
|
|
||||||
else
|
|
||||||
exiterr "This script only supports Amazon Linux 2."
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user