From fb19346211c35a39ca2fdc4561a1a07b799025a5 Mon Sep 17 00:00:00 2001 From: BenjaminE Date: Wed, 6 Jul 2022 16:51:57 +0200 Subject: [PATCH 1/3] reopening pull request - updated main branch --- .../pipelines/azure-devops/templates/package/dotnet-package.sh | 3 +++ .../azure-devops/templates/package/package-pipeline.cfg | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 scripts/pipelines/azure-devops/templates/package/dotnet-package.sh diff --git a/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh b/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh new file mode 100644 index 000000000..977c86d43 --- /dev/null +++ b/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh @@ -0,0 +1,3 @@ +#!/bin/bash +# We define the tag using the version set in the pom.xml +tag=$(echo 'cat //Project/ItemGroup/PackageReference[@Include="Devon4Net.Infrastructure.Common"]/@Version' | xmllint --shell "${imageTagFilePath}" | awk -F'[="]' '!/>/{print $(NF-1)}') \ No newline at end of file diff --git a/scripts/pipelines/azure-devops/templates/package/package-pipeline.cfg b/scripts/pipelines/azure-devops/templates/package/package-pipeline.cfg index 56f692c33..760e1c9e7 100644 --- a/scripts/pipelines/azure-devops/templates/package/package-pipeline.cfg +++ b/scripts/pipelines/azure-devops/templates/package/package-pipeline.cfg @@ -19,7 +19,7 @@ packageLanguageScript="package-extra.sh" # Source branch. sourceBranch="feature/package-pipeline" #Dockerfile Paths depending on the language -dockerfilePaths="quarkus-jvm:src/main/docker/Dockerfile.jvm quarkus:src/main/docker/Dockerfile.native node:Dockerfile angular:Dockerfile" +dockerfilePaths="quarkus-jvm:src/main/docker/Dockerfile.jvm quarkus:src/main/docker/Dockerfile.native node:Dockerfile angular:Dockerfile dotnet:source/Templates/WebAPI/Devon4Net.Application.WebAPI/Dockerfile" dockerImageTagFilePaths="quarkus-jvm:pom.xml quarkus:pom.xml node:package.json angular:package.json" function copyScript { From 5910e0ebd9e4b0a85118d2a59e3139e156da7251 Mon Sep 17 00:00:00 2001 From: BenjaminE Date: Wed, 6 Jul 2022 17:13:04 +0200 Subject: [PATCH 2/3] Update dotnet-package.sh --- .../azure-devops/templates/package/dotnet-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh b/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh index 977c86d43..142f9cb59 100644 --- a/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh +++ b/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh @@ -1,3 +1,3 @@ #!/bin/bash -# We define the tag using the version set in the pom.xml -tag=$(echo 'cat //Project/ItemGroup/PackageReference[@Include="Devon4Net.Infrastructure.Common"]/@Version' | xmllint --shell "${imageTagFilePath}" | awk -F'[="]' '!/>/{print $(NF-1)}') \ No newline at end of file +# We define the tag using the version set in one of the modules (since there is no version given in a template!) +tag=tag=$(xmllint --xpath "string(//Project/PropertyGroup/Version/text())" "${imageTagFilePath}") \ No newline at end of file From 3795d0350eeadd887afc1630425235c8b4b19e6a Mon Sep 17 00:00:00 2001 From: BenjaminE Date: Wed, 6 Jul 2022 17:35:05 +0200 Subject: [PATCH 3/3] typo --- .../pipelines/azure-devops/templates/package/dotnet-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh b/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh index 142f9cb59..8d85276e4 100644 --- a/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh +++ b/scripts/pipelines/azure-devops/templates/package/dotnet-package.sh @@ -1,3 +1,3 @@ #!/bin/bash # We define the tag using the version set in one of the modules (since there is no version given in a template!) -tag=tag=$(xmllint --xpath "string(//Project/PropertyGroup/Version/text())" "${imageTagFilePath}") \ No newline at end of file +tag=$(xmllint --xpath "string(//Project/PropertyGroup/Version/text())" "${imageTagFilePath}") \ No newline at end of file