(v3.0.0.9017) semantic versioning only on branch main

This commit is contained in:
dr. M.S. (Matthijs) Berends committed 2025-07-28 12:24:52 +02:00
1 parent 2f866985c9
commit fc72cf9324
3 files changed
+10 -3

No files matched your search

+7
View File
@@ -68,6 +68,12 @@ echo ""
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo "Updating semantic versioning and date..." echo "Updating semantic versioning and date..."
current_branch=$(git rev-parse --abbrev-ref HEAD)
if [ "$current_branch" != "main" ]; then
echo "- Current branch is '$current_branch'; skipping version/date update (only runs on 'main')"
else
# Version update logic begins here
# Get tags from remote and remove tags not on remote # Get tags from remote and remove tags not on remote
git fetch origin --prune --prune-tags --quiet git fetch origin --prune --prune-tags --quiet
currenttagfull=$(git describe --tags --abbrev=0) currenttagfull=$(git describe --tags --abbrev=0)
@@ -111,6 +117,7 @@ echo ""
# Save the version number for use in the commit-msg hook # Save the version number for use in the commit-msg hook
echo "${currentversion}" > .git/commit_version.tmp echo "${currentversion}" > .git/commit_version.tmp
fi
git add data-raw/* git add data-raw/*
git add data/* git add data/*
+2 -2
View File
@@ -1,6 +1,6 @@
Package: AMR Package: AMR
Version: 3.0.0.9016 Version: 3.0.0.9017
Date: 2025-07-23 Date: 2025-07-28
Title: Antimicrobial Resistance Data Analysis Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR) Description: Functions to simplify and standardise antimicrobial resistance (AMR)
data analysis and to work with microbial and antimicrobial properties by data analysis and to work with microbial and antimicrobial properties by
+1 -1
View File
@@ -1,4 +1,4 @@
# AMR 3.0.0.9016 # AMR 3.0.0.9017
This is primarily a bugfix release, though we added one nice feature too. This is primarily a bugfix release, though we added one nice feature too.