Skip to content

Commit

Permalink
Merge pull request #91 from Axway/APIGOV-25848
Browse files Browse the repository at this point in the history
APIGOV-25848
  • Loading branch information
dfeldick authored Apr 12, 2024
2 parents 40c5164 + 657efec commit 317cbe1
Showing 1 changed file with 5 additions and 17 deletions.
22 changes: 5 additions & 17 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ include:
file:
- "/gitlabci/csrjobs.yml"

.get-latest-tag: &get-latest-tag |
if [ $(git --version | grep -Eo '2.*') ]; then
export LAST_TAG_VERSION=$(git tag -l --sort="version:refname" | grep -Eo '^v?[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$' | tail -1)
else
export LAST_TAG_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))
fi

stages:
- test
- sonar-preview
Expand Down Expand Up @@ -80,8 +73,8 @@ twistlock-discovery:on-schedule:
- !reference [.mirror-schedule-csr-rules, rules]
dependencies: []
before_script:
- apk --no-cache update && apk add git
- *get-latest-tag
- !reference [.get-last-tag, script]
- echo "Using the last tagged version ${LAST_TAG_VERSION}"
- export IMAGE_NAME=ghcr.io/axway/kong_discovery_agent:${LAST_TAG_VERSION}
- docker pull ${IMAGE_NAME}

Expand All @@ -91,21 +84,16 @@ twistlock-traceability:on-schedule:
- !reference [.mirror-schedule-csr-rules, rules]
dependencies: []
before_script:
- apk --no-cache update && apk add git
- *get-latest-tag
- !reference [.get-last-tag, script]
- echo "Using the last tagged version ${LAST_TAG_VERSION}"
- export IMAGE_NAME=ghcr.io/axway/kong_traceability_agent:${LAST_TAG_VERSION}
- docker pull ${IMAGE_NAME}

blackduck:on-schedule:
rules:
- !reference [.mirror-schedule-csr-rules, rules]
before_script:
- git config --global http.sslVerify false
- git config --global url."ssh://[email protected]".insteadOf "https://git.ecd.axway.org"''
- git fetch
- *get-latest-tag
- echo "Checking out ${LAST_TAG_VERSION}"
- git checkout ${LAST_TAG_VERSION}
- !reference [.get-last-tag, script]

# overridden from csrjobs.yml because mirror repos like this one don't get merge events
fortify:
Expand Down

0 comments on commit 317cbe1

Please sign in to comment.