nginx: update to 1.30.2 #29531
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/sh | ||
|
|
||
| # shellcheck shell=busybox | ||
|
|
||
| case "$PKG_NAME" in #luajit2 use build number at -v but releases are named by date | ||
| luajit2) | ||
| exit 0 | ||
| ;; | ||
|
Comment on lines
+5
to
+8
Member
There was a problem hiding this comment. Uhh.. are we sure that this is something that it should be merged? 🤔 I don't mean to be rude, but we have tests here to verify that the application at least runs within CI/CD. Instead, we're just accepting a workaround where we won't test it at all because either upstream or downstream versioning is broken, and we're throwing away the entire run testing for luajit2. That's nonsense, right? Here is the output from CI/CD: This essentially tells me that we aren't going to test luajit2 and we can completely forget about any run testing. This is not right at all, especially considering luajit2 actually does report its version.
Contributor
Author
There was a problem hiding this comment. most test-version.sh overrides are in that structure(krb5/perl/etc...), so I assumed it's standard for version check override?
Member
There was a problem hiding this comment. It's not a standard for version checks. We shouldn't blindly copy overrides without checking if they actually make sense for the package in question. Packages like krb5 have overrides because they don't report their version. But if an application does report its version, there is no reason to skip the test. If perl5 is bypassing it, then that test is probably wrong too. We shouldn't just give up on testing when the binary provides the information we need. For a good reference on how CI/CD runtime testing should actually be done, please take a look at the tests provided by @commodo. |
||
|
|
||
| *) | ||
| echo "Untested package: $PKG_NAME" >&2 | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #!/bin/sh | ||
|
|
||
| # shellcheck shell=busybox | ||
|
|
||
| #xsltproc doesn't say it's own version but only depends | ||
| case "$PKG_NAME" in | ||
| xsltproc|libxslt|libexslt) | ||
| exit 0 | ||
| ;; | ||
|
Comment on lines
+5
to
+9
Member
There was a problem hiding this comment. This is the same case as above and shouldn't be merged yet. I don't think this is the right direction, and we shouldn't accept the contribution in this form. I want to emphasize this because it's an important detail to get right. The whole point of having CI/CD tests is to verify that things actually work. Throwing a test away instead of taking a little time to fix it correctly defeats the purpose of the pipeline. I looked into this, and it took me just a few minutes to find a working approach by using CI/CD. I am using OpenWrt 24.10 (yeah, still): root@turris:~# xsltproc -v -V
Using libxml 21405, libxslt 10142 and libexslt 823
xsltproc was compiled against libxml 21405, libxslt 10142 and libexslt 823
libxslt 10142 was compiled against libxml 21405
libexslt 823 was compiled against libxml 21405
root@turris:~# opkg list-installed | grep xsltproc
xsltproc - 1.1.42-r1Gemini 3.5 Flash (High) says: Instead of dropping the test, we can just parse the version properly. Here is a working implementation for test-version.sh that handles this encoding: #!/bin/sh
# shellcheck shell=busybox
pkg="${1:-$PKG_NAME}"
ver="${2:-$PKG_VERSION}"
case "$pkg" in
libxslt|libexslt)
exit 0
;;
xsltproc)
# libxslt / libxml encode version as major * 10000 + minor * 100 + patch.
# For example, libxslt version 1.1.42 is represented as 10142.
IFS=. read -r major minor patch <<EOF
$ver
EOF
major=$(echo "${major:-0}" | tr -cd '0-9')
minor=$(echo "${minor:-0}" | tr -cd '0-9')
patch=$(echo "${patch:-0}" | tr -cd '0-9')
ver_encoded=$((major * 10000 + minor * 100 + patch))
xsltproc -V 2>&1 | grep -q "libxslt $ver_encoded"
;;
*)
echo "test-version.sh: unhandled sub-package '$pkg'" >&2
exit 1
;;
esacOf course, it needs to be checked, if it is alright and if it works. |
||
|
|
||
| *) | ||
| echo "Untested package: $PKG_NAME" >&2 | ||
| exit 1 | ||
| ;; | ||
| esac | ||
Uh oh!
There was an error while loading. Please reload this page.