Skip to content
Snippets Groups Projects
Commit 425eac7c authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !73
parents 4c2f13ab cdfbc12e
No related branches found
Tags v2.2.24
1 merge request!73Merging develop into main
Pipeline #1281150 passed
...@@ -13,19 +13,19 @@ LABEL com.example.vendor="LakeDrops" \ ...@@ -13,19 +13,19 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION ARG PHP_MAJOR_VERSION
ARG AHOY_VERSION=2.1.1 ARG AHOY_VERSION=2.1.1
ARG DIFFTASTIC_VERSION=0.58.0 ARG DIFFTASTIC_VERSION=0.60.0
ARG DOCKER_CHANNEL=stable ARG DOCKER_CHANNEL=stable
# Check for latest at https://download.docker.com/linux/static/stable/x86_64/ # Check for latest at https://download.docker.com/linux/static/stable/x86_64/
ARG DOCKER_VERSION=26.1.4 ARG DOCKER_VERSION=27.1.1
ARG GIT_EXTRAS_VERSION=7.2.0 ARG GIT_EXTRAS_VERSION=7.2.0
ARG GLAB_VERSION=1.42.0 ARG GLAB_VERSION=1.45.0
ARG apkArch ARG apkArch
ARG buildx_version=0.15.1 ARG buildx_version=0.16.2
# IMPORTANT: keep the docker compose version in sync with the Ansible Docker role. # IMPORTANT: keep the docker compose version in sync with the Ansible Docker role.
ARG compose_version=2.27.3 ARG compose_version=2.29.1
ARG composer_version=2.7.7 ARG composer_version=2.7.7
ARG dockerArch ARG dockerArch
ARG fx_version=34.0.0 ARG fx_version=35.0.0
ARG glibc_version=2.35-r1 ARG glibc_version=2.35-r1
ARG yq_version=4.44.2 ARG yq_version=4.44.2
......
...@@ -20,7 +20,7 @@ glab ci run -b ${branch} --variables-env TRIGGERMODE:manual,TRIGGERTASK:${task}, ...@@ -20,7 +20,7 @@ glab ci run -b ${branch} --variables-env TRIGGERMODE:manual,TRIGGERTASK:${task},
echo "Waiting for pipeline to finish ..." echo "Waiting for pipeline to finish ..."
glab ci status -b ${branch} --live --compact glab ci status -b ${branch} --live --compact
echo "Download artifact ..." echo "Download artifact ..."
glab ci artifact ${branch} ${task}Manual --path="/tmp/${task}/" glab job artifact ${branch} ${task}Manual --path="/tmp/${task}/"
if [[ -d /tmp/${task}/ ]]; then if [[ -d /tmp/${task}/ ]]; then
if [[ "$task" == "CollectDatabase" ]]; then if [[ "$task" == "CollectDatabase" ]]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment