diff --git a/.gitlab-ci/test-install.sh b/.gitlab-ci/test-install.sh index 169804e..8933b83 100644 --- a/.gitlab-ci/test-install.sh +++ b/.gitlab-ci/test-install.sh @@ -2,5 +2,5 @@ . "${CI_PROJECT_DIR}/.gitlab-ci/test.sh" -apt-get -y install "${CI_PROJECT_DIR}/gitea_${VERSION}-${PATCHLEVEL}_amd64.deb" +apt-get -y install "${CI_PROJECT_DIR}/gitea_${VERSION}+${PATCHLEVEL}_amd64.deb" start_gitea diff --git a/.gitlab-ci/test-update.sh b/.gitlab-ci/test-update.sh index acbba17..060f32f 100644 --- a/.gitlab-ci/test-update.sh +++ b/.gitlab-ci/test-update.sh @@ -9,6 +9,6 @@ apt-get -y install gitea cp "/${CI_PROJECT_DIR}/.gitlab-ci/app.ini" /etc/gitea/app.ini start_gitea curl -s localhost:3000/api/v1/version | jq -e '.version' -apt-get -y --allow-downgrades install "${CI_PROJECT_DIR}/gitea_${VERSION}-${PATCHLEVEL}_amd64.deb" +apt-get -y --allow-downgrades install "${CI_PROJECT_DIR}/gitea_${VERSION}+${PATCHLEVEL}_amd64.deb" restart_gitea curl -s localhost:3000/api/v1/version | jq -e '.version' diff --git a/.gitlab-ci/test.sh b/.gitlab-ci/test.sh index 2be6285..7f004e4 100644 --- a/.gitlab-ci/test.sh +++ b/.gitlab-ci/test.sh @@ -2,8 +2,8 @@ set -e -VERSION=$(echo "${CI_COMMIT_TAG#*v}" | cut -d'-' -f1) -PATCHLEVEL=$(echo "${CI_COMMIT_TAG}" | cut -d'-' -f2) +VERSION=$(echo "${CI_COMMIT_TAG#*v}" | cut -d'+' -f1) +PATCHLEVEL=$(echo "${CI_COMMIT_TAG}" | cut -d'+' -f2) export VERSION PATCHLEVEL start_gitea() {