Skip to content

Commit cc1e60b

Browse files
michaelrossherronmichaelrossherron
committed
Updated workflows and added version.h to work with refactor
1 parent a0d53ed commit cc1e60b

9 files changed

Lines changed: 54 additions & 23 deletions

File tree

‎.github/workflows/linux-pull-request.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ permissions:
1212
contents: read # This is required for actions/checkout
1313
jobs:
1414
call_workflow:
15-
uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-pull-request.yml@develop
15+
uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable.yml@develop
1616
with:
17-
aws-ami-id: ${{ vars.LINUX_AMI }}
18-
aws-sg-id: sg-0ca7912782cf1538b
1917
package-name: febiochem
2018
requires-sdk: true
19+
plugin: true
20+
publish: false
2121
secrets: inherit

‎.github/workflows/linux-push.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ permissions:
1111
contents: read # This is required for actions/checkout
1212
jobs:
1313
call_workflow:
14-
uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-push.yml@develop
14+
uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable.yml@develop
1515
with:
16-
aws-ami-id: ${{ vars.LINUX_AMI }}
17-
aws-sg-id: sg-0ca7912782cf1538b
18-
runTests: false
1916
package-name: febiochem
2017
requires-sdk: true
18+
plugin: true
19+
publish: true
2120
secrets: inherit

‎.github/workflows/macos-pull-request.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ permissions:
1212
contents: read # This is required for actions/checkout
1313
jobs:
1414
call_workflow:
15-
uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable-pull-request.yml@develop
15+
uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable.yml@develop
1616
with:
1717
package-name: febiochem
1818
requires-sdk: true
19+
plugin: true
20+
publish: false
1921
secrets: inherit

‎.github/workflows/macos-push.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ permissions:
1111

1212
jobs:
1313
call_workflow:
14-
uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable-push.yml@develop
14+
uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable.yml@develop
1515
with:
1616
package-name: febiochem
1717
requires-sdk: true
18+
plugin: true
19+
publish: true
1820
secrets: inherit

‎.github/workflows/windows-pull-request.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ permissions:
1212
contents: read # This is required for actions/checkout
1313
jobs:
1414
call_workflow:
15-
uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable-pull-request.yml@develop
15+
uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable.yml@develop
1616
with:
17-
register-runner-timeout: 10
18-
aws-ami-id: ${{ vars.WINDOWS_AMI }}
19-
aws-sg-id: sg-0ca7912782cf1538b
20-
aws-instance-type: c5a.8xlarge
2117
package-name: febiochem
2218
requires-sdk: true
19+
plugin: true
20+
publish: false
2321
secrets: inherit

‎.github/workflows/windows-push.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ permissions:
1111
contents: read # This is required for actions/checkout
1212
jobs:
1313
call_workflow:
14-
uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable-push.yml@develop
14+
uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable.yml@develop
1515
with:
16-
aws-ami-id: ${{ vars.WINDOWS_AMI }}
17-
aws-sg-id: sg-0ca7912782cf1538b
18-
aws-instance-type: c5a.8xlarge
19-
runTests: false
2016
package-name: febiochem
2117
requires-sdk: true
18+
plugin: true
19+
publish: true
2220
secrets: inherit

‎FEBioChem/FEBioChem.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//
33

44
#include "stdafx.h"
5+
#include "version.h"
56
#include <FECore/sdk.h>
67
#include "FENLReactionDiffusionSolver.h"
78
#include "FEReactionDiffusionConvection.h"
@@ -50,9 +51,9 @@ FECORE_PLUGIN int GetSDKVersion()
5051

5152
FECORE_PLUGIN void GetPluginVersion(int& major, int& minor, int& patch)
5253
{
53-
major = 1;
54-
minor = 0;
55-
patch = 0;
54+
major = VERSION;
55+
minor = SUBVERSION;
56+
patch = SUBSUBVERSION;
5657
}
5758

5859
FECORE_PLUGIN void PluginInitialize(FECoreKernel& fecore)

‎FEBioChem/version.h‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*This file is part of the FEBio source code and is licensed under the MIT license
2+
listed below.
3+
4+
See Copyright-FEBio.txt for details.
5+
6+
Copyright (c) 2025 University of Utah, The Trustees of Columbia University in
7+
the City of New York, and others.
8+
9+
Permission is hereby granted, free of charge, to any person obtaining a copy
10+
of this software and associated documentation files (the "Software"), to deal
11+
in the Software without restriction, including without limitation the rights
12+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
copies of the Software, and to permit persons to whom the Software is
14+
furnished to do so, subject to the following conditions:
15+
16+
The above copyright notice and this permission notice shall be included in all
17+
copies or substantial portions of the Software.
18+
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
25+
SOFTWARE.*/
26+
27+
#pragma once
28+
29+
#define VERSION 1
30+
#define SUBVERSION 0
31+
#define SUBSUBVERSION 0

‎ci/common‎

0 commit comments

Comments
 (0)