From 12839102d73c5584ee6ad3dd3c52b7827effd711 Mon Sep 17 00:00:00 2001 From: Svante Schubert Date: Wed, 24 May 2023 00:05:36 +0200 Subject: [PATCH] Update script and documentation --- README.md | 2 +- saxon-update.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8e8bc8f..dfa6714 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ There are two GitHub Actions 2. [Deployment](https://github.com/svanteschubert/Saxon-HE-enhanced-accuracy/blob/accuracy-feature/.github/workflows/deployment.yml): Triggered whenever a tag was pushed a GitHub release is being automated made using the version number extracted from the pom.xml file, for instance: 1. **git tag -sm **
e.g. "*git tag -sm v10.6 v10.6*" # using -s to sign the tag & -m is taking the next parameter as message - 2. **git push --follow-tags** # pushing also all tags + 2. **git push --follow-tags --all origin** # pushing also all tags & all branches to origin (this repo) *Note*: The overwrite function does not work a release have to be manually deleted for the same version from pom.xml! ## Reports to Saxonica diff --git a/saxon-update.sh b/saxon-update.sh index 3a01fa6..67ff536 100755 --- a/saxon-update.sh +++ b/saxon-update.sh @@ -6,9 +6,9 @@ set -e -v # !!! PLEASE UPDATE BOTH VARIABLES!!! # !! -> 1. Version number of the Saxon release to be downloaded/merged with! -SAXON_NEXT_VERSION="10.8" +SAXON_NEXT_VERSION="10.9" # !! -> 2. Version number of the Saxon release currently used to add feature branch before rebase! -SAXON_CURRENT_VERSION="10.7" +SAXON_CURRENT_VERSION="10.8" # Do not change below the line... @@ -116,6 +116,9 @@ git commit -am"Saxon ${SAXON_NEXT_VERSION} with our buildable pom.xml." || echo git checkout ${FEATURE_BRANCH} ## Add last version branch before rebasing the new SAXON version and by git rebase lossing all existing commits (new hash by rebase) git checkout -b Saxon-HE-accuracy-v${SAXON_CURRENT_VERSION} +## Come back to latest feature branch and +git checkout ${FEATURE_BRANCH} +## Put (rebase) these feature changes on top of saxon-upstream branch git rebase ${UPSTREAM_BRANCH} sed -i 's/'"${SAXON_CURRENT_VERSION}"'<\/version>/'"${SAXON_NEXT_VERSION}"'<\/version>/g' pom.xml git add .