This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4b3ca6325 updated local scripts for creating release artifacts and
updated GitHub workflows (CONNECTORS-1754)
4b3ca6325 is described below
commit 4b3ca6325e95a3149a2b70235bd1580a14a2a1c7
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Wed Sep 18 11:09:39 2024 +0200
updated local scripts for creating release artifacts and updated GitHub
workflows (CONNECTORS-1754)
---
.github/workflows/create-docker-image.yml | 4 +++-
.github/workflows/create-release-candidate.yml | 2 +-
.github/workflows/license-check.yml | 2 +-
.github/workflows/publish-maven-release.yml | 2 +-
.github/workflows/publish-maven-snapshot.yml | 2 +-
create-release-candidate-only-artifacts.sh | 28 ++++++++++++++++++++++++++
create-release-candidate.sh | 26 ++++++++++++------------
7 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/create-docker-image.yml
b/.github/workflows/create-docker-image.yml
index 0ada10843..b9f885053 100644
--- a/.github/workflows/create-docker-image.yml
+++ b/.github/workflows/create-docker-image.yml
@@ -25,6 +25,7 @@ on:
type: choice
description: Select the ManifoldCF release
options:
+ - 2.27-JDK-11
- 2.26-JDK-11 #Java 11
- 2.25-JDK-8
- 2.24-JDK-8
@@ -57,6 +58,7 @@ on:
jobs:
createDockerImageBuildingFromSourceCode:
if: |
+ (github.event.inputs.release != '2.27-JDK-11') &&
(github.event.inputs.release != '2.26-JDK-11') &&
(github.event.inputs.release != '2.25-JDK-8') &&
(github.event.inputs.release != '2.24-JDK-8') &&
@@ -84,7 +86,7 @@ jobs:
ref: release-${{ steps.mcf.outputs.release }}
- name: Set up OpenJDK ${{ steps.jdk.outputs.version }} Temurin x64
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
java-version: '${{ steps.jdk.outputs.version }}'
distribution: 'temurin'
diff --git a/.github/workflows/create-release-candidate.yml
b/.github/workflows/create-release-candidate.yml
index 64b2597a5..8ea35b85c 100644
--- a/.github/workflows/create-release-candidate.yml
+++ b/.github/workflows/create-release-candidate.yml
@@ -39,7 +39,7 @@ jobs:
uses: actions/[email protected]
- name: Set up OpenJDK 11 Temurin x64
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
java-version: '11'
distribution: 'temurin'
diff --git a/.github/workflows/license-check.yml
b/.github/workflows/license-check.yml
index a05bc3498..a4cb41291 100644
--- a/.github/workflows/license-check.yml
+++ b/.github/workflows/license-check.yml
@@ -29,7 +29,7 @@ jobs:
uses: actions/[email protected]
- name: Set up OpenJDK 11 Temurin x64
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
java-version: '11'
distribution: 'temurin'
diff --git a/.github/workflows/publish-maven-release.yml
b/.github/workflows/publish-maven-release.yml
index 3d5d848cb..96d413dbc 100644
--- a/.github/workflows/publish-maven-release.yml
+++ b/.github/workflows/publish-maven-release.yml
@@ -72,7 +72,7 @@ jobs:
ref: ${{ github.event.inputs.release }}
- name: Set up Java
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
java-version: '11'
distribution: 'temurin'
diff --git a/.github/workflows/publish-maven-snapshot.yml
b/.github/workflows/publish-maven-snapshot.yml
index bc47fff78..37ee68aa6 100644
--- a/.github/workflows/publish-maven-snapshot.yml
+++ b/.github/workflows/publish-maven-snapshot.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/[email protected]
- name: Set up Java
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
java-version: '11'
distribution: 'temurin'
diff --git a/create-release-candidate-only-artifacts.sh
b/create-release-candidate-only-artifacts.sh
new file mode 100644
index 000000000..5ec72198f
--- /dev/null
+++ b/create-release-candidate-only-artifacts.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+#Get Maven POM version
+export mcfVersion=$(mvn help:evaluate -Dexpression=project.version -q
-DforceStdout)
+
+#Built Branch Version
+export currentMavenVersion="$mcfVersion"
+export suffixToRemove="SNAPSHOT"
+export branchVersion=${currentMavenVersion%$suffixToRemove}
+
+#Update all the Maven modules with the new version
+mvn versions:set -DnewVersion=$mcfVersion -DremoveSnapshot
-DgenerateBackupPoms=false
+
+#Update Ant script with the new RC version
+sed -i -e 's/"$mcfVersion"-dev/"$mcfVersion"/g' build.xml;
+
+#Update CHANGES.txt
+sed -i -e 's/"$mcfVersion"-dev/Release "$mcfVersion"/g' CHANGES.txt;
+
+#Ant Build
+ant make-core-deps make-deps image
+
+#Artifact version
+export artifactVersion=$branchVersion"dev"
+
+#Rename KEYS and CHANGES.txt artifacts
+cp KEYS apache-manifoldcf-$artifactVersion.KEYS
+cp CHANGES.txt apache-manifoldcf-$artifactVersion.CHANGES.txt
\ No newline at end of file
diff --git a/create-release-candidate.sh b/create-release-candidate.sh
index b99fa1b43..108682e75 100644
--- a/create-release-candidate.sh
+++ b/create-release-candidate.sh
@@ -5,24 +5,24 @@ releasecandidatetag=$1
export mcfVersion=$(mvn help:evaluate -Dexpression=project.version -q
-DforceStdout)
#Built Branch Version
-currentMavenVersion="$mcfVersion"
-suffixToRemove="SNAPSHOT"
-branchVersion=${currentMavenVersion%"$suffixToRemove"}
+export currentMavenVersion="$mcfVersion"
+export suffixToRemove="SNAPSHOT"
+export branchVersion=${currentMavenVersion%$suffixToRemove}
branchTag=$branchVersion$releasecandidatetag
#Create new release candidate branch
git branch release-$branchTag
-git push --set-upstream origin release-branchTag
-git checkout release-branchTag
+git push --set-upstream origin release-$branchTag
+git checkout release-$branchTag
#Update all the Maven modules with the new version
-mvn versions:set -DnewVersion=mcfVersion -DremoveSnapshot
-DgenerateBackupPoms=false
+mvn versions:set -DnewVersion=$mcfVersion -DremoveSnapshot
-DgenerateBackupPoms=false
#Update Ant script with the new RC version
-sed -i 's/$mcfVersion-dev/$mcfVersion/g' build.xml;
+sed -i -e 's/"$mcfVersion"-dev/"$mcfVersion"/g' build.xml;
#Update CHANGES.txt
-sed -i 's/$mcfVersion-dev/Release $mcfVersion/g' CHANGES.txt;
+sed -i -e 's/"$mcfVersion"-dev/Release "$mcfVersion"/g' CHANGES.txt;
#Ant Build
ant make-core-deps make-deps image
@@ -31,10 +31,10 @@ ant make-core-deps make-deps image
mvn clean install -B -DskipTests -DskipITs
#Update MCF version in the properties.xml files
-sed -i 's/$mcfVersion-dev/$mcfVersion/g' dist/example/properties.xml;
-sed -i 's/$mcfVersion-dev/$mcfVersion/g'
dist/example-proprietary/properties.xml;
-sed -i 's/$mcfVersion-dev/$mcfVersion/g'
dist/multiprocess-file-example/properties.xml;
-sed -i 's/$mcfVersion-dev/$mcfVersion/g'
dist/multiprocess-file-example-proprietary/properties.xml;
+sed -i -e 's/"$mcfVersion"-dev/"$mcfVersion"/g' dist/example/properties.xml;
+sed -i -e 's/"$mcfVersion"-dev/"$mcfVersion"/g'
dist/example-proprietary/properties.xml;
+sed -i -e 's/"$mcfVersion"-dev/"$mcfVersion"/g'
dist/multiprocess-file-example/properties.xml;
+sed -i -e 's/"$mcfVersion"-dev/"$mcfVersion"/g'
dist/multiprocess-file-example-proprietary/properties.xml;
#RAT licence checks
mvn -pl . apache-rat:check
@@ -50,7 +50,7 @@ git commit -am "Create $releasecandidatetag tag for MCF
$mcfVersion"
git push
#Artifact version
-export artifactVersion=$branchVersiondev
+export artifactVersion=$branchVersion"dev"
#Rename KEYS and CHANGES.txt artifacts
cp KEYS apache-manifoldcf-$artifactVersion.KEYS
