Compare commits

...

6 Commits

Author SHA1 Message Date
zenobit 4f2804ff94
Merge 0143416856 into 04b37ccf02 2024-05-04 10:41:31 +02:00
Martin Wimpress 04b37ccf02 refactor: make zsync_get() consistent with other checks 2024-05-04 09:03:44 +01:00
Martin Wimpress 2e1b556b93 fix: correctly format url show daily-live tests 2024-05-04 09:03:44 +01:00
Martin Wimpress c693dc9ba7 fix: prevent daily-live images being downloaded during test 2024-05-04 09:03:44 +01:00
zen0bit 50817d2dba fix: correct shellcheck error 2068 2024-05-04 09:03:44 +01:00
zen0bit 0143416856 ci: Add PR template (RAW initial commit) 2024-05-01 20:48:21 +02:00
2 changed files with 33 additions and 14 deletions

22
.github/pull_request_template vendored Normal file
View File

@ -0,0 +1,22 @@
<!-- Uncomment relevant sections fill relevant and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### Change current OS
- This PR will change current OS: **YES**|**NO**
- Enter changed OS name: **NAME**
-->
<!--
#### Add new OS
- This PR will add new OS: **YES**|**NO**
- Enter new OS name: **NAME**
-->
<!--
#### Change something else
- This PR will change something else: **YES**|**NO**
- Enter short description of changes: **DESCRIPTION**
-->

View File

@ -1099,22 +1099,22 @@ function releases_ubuntu() {
local EOL_VERSIONS=($(IFS=$'\n' jq -r 'select(.status=="Obsolete") | .version' <<<${VERSION_DATA} | sort))
case "${OS}" in
ubuntu)
echo ${SUPPORTED_VERSIONS[@]} daily-live ${EOL_VERSIONS[@]/#/eol-};;
echo "${SUPPORTED_VERSIONS[@]}" daily-live "${EOL_VERSIONS[@]/#/eol-}";;
kubuntu|lubuntu|ubuntukylin|ubuntu-mate|ubuntustudio|xubuntu)
# after 16.04
echo ${SUPPORTED_VERSIONS[@]:1} daily-live ${EOL_VERSIONS[@]/#/eol-};;
echo "${SUPPORTED_VERSIONS[@]:1}" daily-live "${EOL_VERSIONS[@]/#/eol-}";;
ubuntu-budgie)
# after 18.04
echo ${SUPPORTED_VERSIONS[@]:2} daily-live ${EOL_VERSIONS[@]/#/eol-};;
echo "${SUPPORTED_VERSIONS[@]:2}" daily-live "${EOL_VERSIONS[@]/#/eol-}";;
edubuntu|ubuntu-unity|ubuntucinnamon)
# after 23.10
echo ${SUPPORTED_VERSIONS[@]:5} daily-live ${EOL_VERSIONS[@]/#/eol-};;
echo "${SUPPORTED_VERSIONS[@]:5}" daily-live "${EOL_VERSIONS[@]/#/eol-}";;
esac
}
function releases_ubuntu-server() {
local ALL_VERSIONS=($(IFS=$'\n' web_pipe http://releases.ubuntu.com/streams/v1/com.ubuntu.releases:ubuntu-server.json | jq -r '.products[] | select(.arch=="amd64") | .version' | sort -rV))
echo ${ALL_VERSIONS[@]}
echo "${ALL_VERSIONS[@]}"
}
function releases_vanillaos() {
@ -1290,22 +1290,19 @@ function web_check() {
}
function zsync_get() {
local CHECK=""
local DIR="${2}"
local FILE="${1##*/}"
local OUT=""
local URL="${1}"
# Test mode for ISO
if [ "${OPERATION}" == "show" ]; then
echo "${URL}"
test_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
exit 0
elif [ "${OPERATION}" == "test" ]; then
CHECK=$(web_check "${URL}" && echo 'PASS' || echo 'FAIL')
test_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}" "${CHECK}"
exit 0
elif [ "${OPERATION}" == "check" ]; then
if ! web_check "${URL}"; then
check_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}" "FAIL"
exit 0
else
check_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}" "PASS"
exit 0
fi
elif command -v zsync &>/dev/null; then
if [ -n "${3}" ]; then
OUT="${3}"