Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add a development tag to version #136

Merged
merged 1 commit into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ jobs:
contents: write
steps:
- uses: actions/checkout@v3
# The exit status for grep -q is 0 if a match is found, 1 if not fund
- name: confirm that Version.is_development is 0
run: grep -q "Version.is_development = 0;" vbr/support/vbr_version.m
- name: confirm that the release tag matches release_notes.md
run: grep -q ${{ github.ref }} release_notes.md
- uses: ncipollo/release-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 3 additions & 1 deletion release_notes.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# v1.1.3
# v1.1.2dev

## New Features
* new method: analytica_andrade, an
* updates to xfit_premelt:
* add direct melt effects from Yamauchi and Takei, 2024. The `xfit_premelt` method will use the updated parameter values when `VBR.in.anelastic.xfit_premelt.include_direct_melt_effect = 1;` (default is 0, a future VBRc version will change the default to 1).
* change default exponential melt factor (the alpha in exp(-alpha*phi) in the viscosity relationship) from 25 to 30.
* add a `VBR_save` function for saving `VBR` structures
* add framework for handling temporary files in test suite
* add convenience function, `full_nd`, to create filled arrays
* add a development tag to version structure

## Bug fix
* fix for undefined behavior of pre-melt scaling at Tn == 1.0
6 changes: 5 additions & 1 deletion vbr/support/vbr_version.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
% return the current VBRc version
Version.major = 1;
Version.minor = 1;
Version.patch = 3;
Version.patch = 2;
Version.version = [num2str(Version.major), '.', ...
num2str(Version.minor), '.', ...
num2str(Version.patch)];
Version.is_development = 1;
if Version.is_development == 1
Version.version = [Version.version, 'dev'];
end
end
14 changes: 14 additions & 0 deletions vbr/testing/test_vbr_version.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@
TestResult.fail_message = msg;
end

if isfield(version, 'is_development') == 0
TestResult.passed = false;
msg = ' vbr_version output missing is_development field';
disp(msg)
TestResult.fail_message = msg;
elseif version.is_development == 1
if strfind(version.version, 'dev') == 0
TestResult.passed = false;
msg = ' vbr_version missing dev tag';
disp(msg)
TestResult.fail_message = msg;
end
end

% also check that the version gets attached to the VBR in a call
VBR.in.elastic.methods_list={'anharmonic'};

Expand Down
Loading