diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8b401d7be7b80e963ddcf24a731f867de62e6b3..d7cade209ba015413e66dc5010030f0558fe6061 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ include: file: '/tagrelease.yml' variables: + SUPPORT_LATEST_TAG: 1 VERSION: ${CI_COMMIT_TAG} before_script: diff --git a/bin/download b/bin/download index f6828383911404339f155036d0cf862edb93ff9a..9972ef5c0123dcc7c81f09cf0900065f068a278e 100755 --- a/bin/download +++ b/bin/download @@ -90,7 +90,7 @@ else echo "Find project ID from remote URL ..." # shellcheck disable=SC2001 path="$(echo "$path" | sed -e 's,\..*,,g')" - gitlab 200 GET "projects?search_namespaces=1&search=$path" + gitlab 200 GET "projects?archived=0&search_namespaces=1&search=$path" PRJID=$(echo "$result" | jq -r .[0]."id") if [[ "a${PRJID}a" == "aa" ]]; then echo "No project found" @@ -104,10 +104,28 @@ fi echo "Find pipeline trigger token ..." gitlab 200 GET projects/"$PRJID"/triggers -TRIGGERTOKEN=$(echo "$result" | jq -r .[0]."token") -if [[ "a${TRIGGERTOKEN}a" == "aa" ]]; then - echo "No trigger token found" - exit 7 +TRIGGERTOKEN=none +i=0 +while [ $i -ge 0 ] +do + TOKEN=$(echo "$result" | jq -r .[$i]."token") + if [[ "$TOKEN" == "null" ]]; then + i=-1 + elif [[ ${#TOKEN} -eq 4 ]]; then + ((i=i+1)) + else + TRIGGERTOKEN=$TOKEN + i=-1 + fi +done +if [[ "$TRIGGERTOKEN" == "none" ]] || [[ "a${TRIGGERTOKEN}a" == "aa" ]]; then + echo "No token found, creating one ..." + gitlab 201 POST projects/"$PRJID"/triggers --data "description=Created by L3D" + TRIGGERTOKEN=$(echo "$result" | jq -r ."token") + if [[ "$TRIGGERTOKEN" == "none" ]] || [[ "a${TRIGGERTOKEN}a" == "aa" ]]; then + echo "No trigger token found and can not create one" + exit 7 + fi fi echo "Trigger pipeline ..." diff --git a/bin/phpstan b/bin/phpstan deleted file mode 100755 index e9c84dc55be847520abcf56cd0dad4283a87ad5f..0000000000000000000000000000000000000000 --- a/bin/phpstan +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -export $(cat .env | xargs) -docker run --rm -v $(php /usr/local/bin/volume.php /app) ghcr.io/phpstan/phpstan "$@" -EC=$? - -exit $EC diff --git a/bin/rector b/bin/rector deleted file mode 100755 index 0196210b712abcf5c658e8c4908a66d28045eab0..0000000000000000000000000000000000000000 --- a/bin/rector +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -docker compose exec ${LAKEDROPS_DEV_DC_OPTIONS} php /var/www/html/vendor/bin/rector "$@" -EC=$? - -exit $EC