Skip to content

Commit d5444c4

Browse files
Merge branch 'develop' into febiostudio3
2 parents 3106274 + 6328a6e commit d5444c4

File tree

16 files changed

+120
-196
lines changed

16 files changed

+120
-196
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ 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
19-
aws-instance-type: c5a.8xlarge
2017
package-name: febio-studio
2118
requires-sdk: true
19+
publish: false
2220
secrets: inherit

.github/workflows/linux-push.yml

Lines changed: 2 additions & 4 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/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: febio-studio
2017
requires-sdk: true
2118
python-module: true
19+
publish: true
2220
secrets: inherit

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ 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: febio-studio
1818
requires-sdk: true
19-
sdk-config: |
20-
{
21-
"sdk_path": "develop",
22-
"version": "v4.6",
23-
}
19+
publish: false
20+
# sdk-config: |
21+
# {
22+
# "sdk_path": "develop",
23+
# "version": "v4.6",
24+
# }
2425
secrets: inherit

.github/workflows/macos-push.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ permissions:
1212

1313
jobs:
1414
call_workflow:
15-
uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable-push.yml@develop
15+
uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable.yml@develop
1616
with:
1717
package-name: febio-studio
1818
requires-sdk: true
1919
post-build: true
2020
python-module: false
21+
publish: true
2122
secrets: inherit

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ 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: febio-studio
2218
requires-sdk: true
19+
publish: false
2320
secrets: inherit

.github/workflows/windows-push.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +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: febio-studio
2117
requires-sdk: true
2218
python-module: true
19+
publish: true
2320
secrets: inherit

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "ci/common"]
2+
path = ci/common
3+
url = git@github.com:febiosoftware/ci-common.git

0 commit comments

Comments
 (0)