athens-school/Gitlab
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2-ci-pipeline-fails-at-build-time' into 'master'

Browse Source 
Resolve "CI pipeline fails at build time"

Closes #2

See merge request athens-school/gitlab!2
This commit is contained in:
Tanguy Herbron 2021-11-23 10:21:00 +00:00
commit 7939921155
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -11,7 +11,7 @@ fetch-versions:
- git clone https://gitlab.com/gitlab-org/omnibus-gitlab - git clone https://gitlab.com/gitlab-org/omnibus-gitlab
- cd omnibus-gitlab - cd omnibus-gitlab
- "HALIA_VER=$(curl --request GET -L --header 'Accept: application/json' --header 'Content-Type: application/json' https://git.halia.dev/api/v4/projects/24/registry/repositories/6/tags | jq -r '.[].location' | grep -v latest | cut -d ':' -f2 | sort -V | tail -1)" - "HALIA_VER=$(curl --request GET -L --header 'Accept: application/json' --header 'Content-Type: application/json' https://git.halia.dev/api/v4/projects/24/registry/repositories/6/tags | jq -r '.[].location' | grep -v latest | cut -d ':' -f2 | sort -V | tail -1)"
- "GITLAB_VER=$(git tag | sort -V | grep ce | tail -1 | cut -d '+' -f1)" - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1 | cut -d '+' -f1)"
- if [ $HALIA_VER != $GITLAB_VER ]; then echo "export NEED_UPDATE=true" > ../.env.update; fi - if [ $HALIA_VER != $GITLAB_VER ]; then echo "export NEED_UPDATE=true" > ../.env.update; fi
artifacts: artifacts:
paths: paths:
@ -29,7 +29,7 @@ build-image:
- apk add git wget - apk add git wget
- git clone https://gitlab.com/gitlab-org/omnibus-gitlab - git clone https://gitlab.com/gitlab-org/omnibus-gitlab
- cd omnibus-gitlab - cd omnibus-gitlab
- "GITLAB_VER=$(git tag | sort -V | grep ce | tail -1)" - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1)"
- "GITLAB_SHORT_VER=$(echo $GITLAB_VER | cut -d '+' -f 1)" - "GITLAB_SHORT_VER=$(echo $GITLAB_VER | cut -d '+' -f 1)"
- git checkout $GITLAB_VER - git checkout $GITLAB_VER
- "GITLAB_VER=$(echo $GITLAB_VER | tr '+' -)" - "GITLAB_VER=$(echo $GITLAB_VER | tr '+' -)"