From 33e2a9e98bf336dcf748a3be7d4fae320c3ec361 Mon Sep 17 00:00:00 2001
From: Pierre Smeyers <pierre.smeyers@gmail.com>
Date: Fri, 8 Dec 2023 15:17:43 +0100
Subject: [PATCH] refactor(yaml): replace anchors with ref tags
---
templates/gitlab-ci-maven-jib.yml | 6 +++---
templates/gitlab-ci-maven.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/templates/gitlab-ci-maven-jib.yml b/templates/gitlab-ci-maven-jib.yml
index 97b921c..7e0875a 100644
--- a/templates/gitlab-ci-maven-jib.yml
+++ b/templates/gitlab-ci-maven-jib.yml
@@ -44,7 +44,7 @@ mvn-build:
extends: .mvn-base
script:
# initialize Docker auth config
- - *mvn-jib-scripts
+ - !reference [.mvn-jib-scripts]
# build and push snapshot container
- >-
mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args verify
@@ -78,7 +78,7 @@ mvn-sbom:
dependencies: []
script:
# initialize Docker auth config
- - *mvn-jib-scripts
+ - !reference [.mvn-jib-scripts]
- mkdir -p -m 777 reports
- /syft packages $MAVEN_JIB_SNAPSHOT_IMAGE $MAVEN_SBOM_OPTS -o cyclonedx-json=reports/mvn-sbom-${jib_digest}.cyclonedx.json
- chmod a+r reports/mvn-sbom-${jib_digest}.cyclonedx.json
@@ -151,7 +151,7 @@ mvn-deploy-release:
GIT_STRATEGY: none
script:
# initialize Docker auth config
- - *mvn-jib-scripts
+ - !reference [.mvn-jib-scripts]
- |
if [[ "${SEMREL_INFO_ON}" && "${MVN_SEMREL_RELEASE_DISABLED}" != "true" ]]
then
diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml
index b068269..59026d2 100644
--- a/templates/gitlab-ci-maven.yml
+++ b/templates/gitlab-ci-maven.yml
@@ -426,7 +426,7 @@ stages:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "maven", "3.7.1" ]
before_script:
- - *mvn-scripts
+ - !reference [.mvn-scripts]
- install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"
- eval_java_proxy_args
- eval_mvn_settings_opt
--
GitLab