Skip to content

Commit

Permalink
Update script and documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
svanteschubert committed May 23, 2023
1 parent 45439d6 commit 1283910
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <TAG_MESSAGE> <TAG_LABEL>**</br>
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
Expand Down
7 changes: 5 additions & 2 deletions saxon-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down Expand Up @@ -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/<version>'"${SAXON_CURRENT_VERSION}"'<\/version>/<version>'"${SAXON_NEXT_VERSION}"'<\/version>/g' pom.xml
git add .
Expand Down

0 comments on commit 1283910

Please sign in to comment.