Skip to content

Commit 31c7873

Browse files
authored
Merge pull request #18 from linuxserver/buildfix
use proper version ingestion
2 parents 272a830 + 6374100 commit 31c7873

File tree

4 files changed

+153
-131
lines changed

4 files changed

+153
-131
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
echo "> External trigger running off of master branch. To disable this trigger, add \`darktable_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/linuxserver/docker-baseimage-kasmvnc/releases | jq -r 'first(.[] | select(.tag_name | startswith("arch-"))) | .tag_name' | sed 's|arch-||' | sed 's|-ls.*||')
32+
EXT_RELEASE=$(curl -sL https://archlinux.org/packages/extra/x86_64/darktable/ |awk -F'(<h2>darktable |</h2>)' '/<h2>/ {print $2}')
3333
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^darktable_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pipeline {
147147
steps{
148148
script{
149149
env.EXT_RELEASE = sh(
150-
script: ''' curl -sX GET https://api.github.com/repos/linuxserver/docker-baseimage-kasmvnc/releases | jq -r 'first(.[] | select(.tag_name | startswith("arch-"))) | .tag_name' | sed 's|arch-||' | sed 's|-ls.*||' ''',
150+
script: ''' curl -sL https://archlinux.org/packages/extra/x86_64/darktable/ |awk -F'(<h2>darktable |</h2>)' '/<h2>/ {print $2}' ''',
151151
returnStdout: true).trim()
152152
env.RELEASE_LINK = 'custom_command'
153153
}
@@ -283,7 +283,7 @@ pipeline {
283283
-v ${WORKSPACE}:/mnt \
284284
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
285285
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
286-
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
286+
ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
287287
apk add --no-cache python3 && \
288288
python3 -m venv /lsiopy && \
289289
pip install --no-cache-dir -U pip && \

0 commit comments

Comments
 (0)