diff --git a/Jenkinsfile b/Jenkinsfile index c5cbd13..5f600f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,6 +79,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.CI_TEST_ATTEMPTED = '' + env.PUSH_ATTEMPTED = '' env.LS_RELEASE = sh( script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() @@ -935,6 +936,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + script{ + env.PUSH_ATTEMPTED = 'true' + } retry_backoff(5,5) { sh '''#! /bin/bash set -e @@ -964,11 +968,18 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + script{ + env.PUSH_ATTEMPTED = 'true' + } retry_backoff(5,5) { sh '''#! /bin/bash set -e for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + if [[ "${MANIFESTIMAGE%%/*}" =~ \\. ]]; then + MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" + else + MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + fi IFS=',' read -ra CACHE <<< "$BUILDCACHE" for i in "${CACHE[@]}"; do if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then @@ -1136,7 +1147,7 @@ EOF } script { if (env.GITHUBIMAGE =~ /lspipepr/){ - if (env.CI_TEST_ATTEMPTED == "true"){ + if (env.CI_TEST_ATTEMPTED == "true" || env.PUSH_ATTEMPTED == "true"){ sh '''#! /bin/bash # Function to retrieve JSON data from URL get_json() { @@ -1197,14 +1208,21 @@ EOF curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ -H "Accept: application/vnd.github.v3+json" \ "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR for commit ${COMMIT_SHA:0:7} : \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" else curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ -H "Accept: application/vnd.github.v3+json" \ "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR for commit ${COMMIT_SHA:0:7} : \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" fi ''' + } else { + sh '''#! /bin/bash + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, the build for PR commit ${COMMIT_SHA:0:7} failed and as a result no CI test was attempted and no images were pushed.\\"}" + ''' } } } diff --git a/package_versions.txt b/package_versions.txt index 7d2ed82..931ed22 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,23 +4,23 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.7.0-r0 apk alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk -alpine-release 3.22.3-r0 apk +alpine-release 3.22.4-r0 apk aom-libs 3.12.1-r0 apk -apache2-utils 2.4.66-r0 apk +apache2-utils 2.4.67-r0 apk apk-tools 2.14.9-r3 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk bash 5.2.37-r0 apk blade-ui-kit/blade-heroicons 2.7.0 php-composer -blade-ui-kit/blade-icons 1.9.1 php-composer +blade-ui-kit/blade-icons 1.10.0 php-composer brick/math 0.14.8 php-composer brotli-libs 1.1.0-r2 apk busybox 1.37.0-r20 apk busybox-binsh 1.37.0-r20 apk c-ares 1.34.6-r0 apk -ca-certificates 20250911-r0 apk -ca-certificates-bundle 20250911-r0 apk +ca-certificates 20260413-r0 apk +ca-certificates-bundle 20260413-r0 apk carbonphp/carbon-doctrine-types 3.2.0 php-composer catatonit 0.2.1-r0 apk chillerlan/php-qrcode 5.0.5 php-composer @@ -28,7 +28,7 @@ chillerlan/php-settings-container 3.3.0 php-composer chrisullyott/php-filesize v4.2.1 php-composer clue/stream-filter v1.7.0 php-composer codewithdennis/filament-simple-alert v4.0.5 php-composer -composer 2.9.7 binary +composer 2.9.8 binary coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk coreutils-fmt 9.7-r1 apk @@ -42,17 +42,17 @@ doctrine/inflector 2.1.0 php-composer doctrine/lexer 3.0.1 php-composer dragonmantank/cron-expression v3.6.0 php-composer egulias/email-validator 4.0.4 php-composer -filament/actions v5.5.2 php-composer -filament/filament v5.5.2 php-composer -filament/forms v5.5.2 php-composer -filament/infolists v5.5.2 php-composer -filament/notifications v5.5.2 php-composer -filament/query-builder v5.5.2 php-composer -filament/schemas v5.5.2 php-composer -filament/spatie-laravel-settings-plugin v5.5.2 php-composer -filament/support v5.5.2 php-composer -filament/tables v5.5.2 php-composer -filament/widgets v5.5.2 php-composer +filament/actions v5.6.3 php-composer +filament/filament v5.6.3 php-composer +filament/forms v5.6.3 php-composer +filament/infolists v5.6.3 php-composer +filament/notifications v5.6.3 php-composer +filament/query-builder v5.6.3 php-composer +filament/schemas v5.6.3 php-composer +filament/spatie-laravel-settings-plugin v5.6.3 php-composer +filament/support v5.6.3 php-composer +filament/tables v5.6.3 php-composer +filament/widgets v5.6.3 php-composer findutils 4.10.0-r0 apk freetype 2.13.3-r0 apk fruitcake/php-cors v1.4.0 php-composer @@ -75,10 +75,10 @@ iputils-tracepath 20240905-r0 apk jq 1.8.1-r0 apk kirschbaum-development/eloquent-power-joins 4.3.1 php-composer laravel-notification-channels/telegram 7.0.0 php-composer -laravel/framework v13.5.0 php-composer -laravel/prompts v0.3.16 php-composer -laravel/sanctum v4.3.1 php-composer -laravel/serializable-closure v2.0.12 php-composer +laravel/framework v13.8.0 php-composer +laravel/prompts v0.3.17 php-composer +laravel/sanctum v4.3.2 php-composer +laravel/serializable-closure v2.0.13 php-composer league/commonmark 2.8.2 php-composer league/config v1.2.0 php-composer league/csv 9.28.0 php-composer @@ -128,7 +128,7 @@ libxt 1.3.1-r0 apk libyuv 0.0.1887.20251502-r1 apk libzip 1.11.4-r0 apk linux-pam 1.7.0-r4 apk -livewire/livewire v4.2.4 php-composer +livewire/livewire v4.3.0 php-composer logrotate 3.21.0-r1 apk lorisleiva/laravel-actions v2.10.1 php-composer lorisleiva/lody v0.7.0 php-composer @@ -144,9 +144,9 @@ nesbot/carbon 3.11.4 php-composer netcat-openbsd 1.229.1-r0 apk nette/php-generator v4.2.2 php-composer nette/schema v1.3.5 php-composer -nette/utils v4.1.3 php-composer -nghttp2-libs 1.65.0-r0 apk -nginx 1.28.3-r0 apk +nette/utils v4.1.4 php-composer +nghttp2-libs 1.69.0-r0 apk +nginx 1.28.3-r1 apk nikic/php-parser v5.7.0 php-composer nunomaduro/termwind v2.4.0 php-composer oniguruma 6.9.10-r0 apk @@ -212,11 +212,11 @@ ramsey/collection 2.1.1 php-composer ramsey/uuid 4.9.2 php-composer readline 8.2.13-r1 apk ryangjchandler/blade-capture-directive v1.1.1 php-composer -saloonphp/laravel-plugin v4.2.0 php-composer +saloonphp/laravel-plugin v4.3.0 php-composer saloonphp/saloon v4.0.0 php-composer scanelf 1.3.8-r1 apk scrivo/highlight.php v9.18.1.10 php-composer -secondnetwork/blade-tabler-icons v3.41.0 php-composer +secondnetwork/blade-tabler-icons v3.44.0 php-composer shadow 4.17.3-r0 apk shiki-php UNKNOWN npm skalibs-libs 2.14.4.0-r0 apk @@ -224,55 +224,56 @@ spatie/invade 2.1.0 php-composer spatie/laravel-json-api-paginate 2.0.1 php-composer spatie/laravel-package-tools 1.93.0 php-composer spatie/laravel-query-builder 6.4.4 php-composer -spatie/laravel-settings 3.7.2 php-composer +spatie/laravel-settings 3.8.0 php-composer spatie/laravel-webhook-server 3.10.0 php-composer spatie/ping 1.2.1 php-composer -spatie/shiki-php 2.3.3 php-composer +spatie/shiki-php 2.4.0 php-composer spatie/temporary-directory 2.3.1 php-composer sqlite-libs 3.49.2-r1 apk ssl_client 1.37.0-r20 apk ssmtp 2.64-r22 apk swagger-php-tools 1.0.0 npm symfony/clock v8.0.8 php-composer -symfony/console v8.0.8 php-composer -symfony/css-selector v8.0.8 php-composer -symfony/deprecation-contracts v3.6.0 php-composer +symfony/console v8.0.9 php-composer +symfony/css-selector v8.0.9 php-composer +symfony/deprecation-contracts v3.7.0 php-composer symfony/error-handler v8.0.8 php-composer -symfony/event-dispatcher v8.0.8 php-composer -symfony/event-dispatcher-contracts v3.6.0 php-composer +symfony/event-dispatcher v8.0.9 php-composer +symfony/event-dispatcher-contracts v3.7.0 php-composer symfony/finder v8.0.8 php-composer symfony/html-sanitizer v8.0.8 php-composer symfony/http-foundation v8.0.8 php-composer -symfony/http-kernel v8.0.8 php-composer +symfony/http-kernel v8.0.10 php-composer symfony/mailer v8.0.8 php-composer -symfony/mime v8.0.8 php-composer +symfony/mime v8.0.9 php-composer symfony/options-resolver v8.0.8 php-composer -symfony/polyfill-ctype v1.36.0 php-composer -symfony/polyfill-intl-grapheme v1.36.0 php-composer -symfony/polyfill-intl-idn v1.36.0 php-composer -symfony/polyfill-intl-normalizer v1.36.0 php-composer -symfony/polyfill-mbstring v1.36.0 php-composer -symfony/polyfill-php80 v1.36.0 php-composer -symfony/polyfill-php84 v1.36.0 php-composer -symfony/polyfill-php85 v1.36.0 php-composer -symfony/polyfill-uuid v1.36.0 php-composer +symfony/polyfill-ctype v1.37.0 php-composer +symfony/polyfill-intl-grapheme v1.37.0 php-composer +symfony/polyfill-intl-idn v1.37.0 php-composer +symfony/polyfill-intl-normalizer v1.37.0 php-composer +symfony/polyfill-mbstring v1.37.0 php-composer +symfony/polyfill-php80 v1.37.0 php-composer +symfony/polyfill-php84 v1.37.0 php-composer +symfony/polyfill-php85 v1.37.0 php-composer +symfony/polyfill-php86 v1.37.0 php-composer +symfony/polyfill-uuid v1.37.0 php-composer symfony/process v8.0.8 php-composer -symfony/routing v8.0.8 php-composer -symfony/service-contracts v3.6.1 php-composer +symfony/routing v8.0.9 php-composer +symfony/service-contracts v3.7.0 php-composer symfony/string v8.0.8 php-composer -symfony/translation v8.0.8 php-composer -symfony/translation-contracts v3.6.1 php-composer -symfony/uid v8.0.8 php-composer +symfony/translation v8.0.10 php-composer +symfony/translation-contracts v3.7.0 php-composer +symfony/uid v8.0.9 php-composer symfony/var-dumper v8.0.8 php-composer -symfony/yaml v8.0.8 php-composer +symfony/yaml v8.0.10 php-composer tijsverkoyen/css-to-inline-styles v2.4.0 php-composer tiptap-php UNKNOWN npm -tzdata 2026a-r0 apk +tzdata 2026b-r0 apk ueberdosis/tiptap-php 2.1.0 php-composer utmps-libs 0.1.3.1-r0 apk vlucas/phpdotenv v5.6.3 php-composer -voku/portable-ascii 2.1.0 php-composer -xz-libs 5.8.1-r0 apk +voku/portable-ascii 2.1.1 php-composer +xz-libs 5.8.3-r0 apk zircote/swagger-php 5.8.3 php-composer -zlib 1.3.1-r2 apk +zlib 1.3.2-r0 apk zstd-libs 1.5.7-r0 apk