Merge branch 'ci/develop' into develop

tundranerd · Mar 3, 2024 · 420046b · 420046b
2 parents 7a21594 + 64c5843
commit 420046b
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/linux-pull-request.yml b/.github/workflows/linux-pull-request.yml
@@ -11,7 +11,7 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: tundranerd/febio-workflows/.github/workflows/linux-reusable-pull-request.yml@develop
+    uses: tundranerd/febio-workflows/.github/workflows/linux-reusable-pull-request.yml@oidc-wip-aws
     with:
       runTests: true
       package-name: febio4

diff --git a/.github/workflows/linux-push.yml b/.github/workflows/linux-push.yml
@@ -16,7 +16,7 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: tundranerd/febio-workflows/.github/workflows/linux-reusable-push.yml@develop
+    uses: tundranerd/febio-workflows/.github/workflows/linux-reusable-push.yml@oidc-wip-aws
     with:
       runTests: ${{ inputs.runTests == 'true' }}
       package-name: febio4

diff --git a/.github/workflows/macos-pull-request.yml b/.github/workflows/macos-pull-request.yml
@@ -1,6 +1,6 @@
 name: CI - MacOS Pull Request
 on:
-  pull_request:
+  pull_request_target:
     types:
       - opened
       - edited
@@ -11,7 +11,7 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: tundranerd/febio-workflows/.github/workflows/macos-reusable.yml@develop
+    uses: tundranerd/febio-workflows/.github/workflows/macos-reusable-pull-request.yml@oidc-wip-aws
     with:
       runTests: true
       package-name: febio4

diff --git a/.github/workflows/macos-push.yml b/.github/workflows/macos-push.yml
@@ -15,7 +15,7 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: tundranerd/febio-workflows/.github/workflows/macos-reusable.yml@develop
+    uses: tundranerd/febio-workflows/.github/workflows/macos-reusable-push.yml@oidc-wip-aws
     with:
       runTests: ${{ inputs.runTests == 'true' }}
       package-name: febio4

diff --git a/.github/workflows/windows-pull-request.yml b/.github/workflows/windows-pull-request.yml
@@ -1,7 +1,7 @@
 name: CI - Windows Pull Request
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - opened
       - edited
@@ -12,7 +12,7 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable.yml@develop
+    uses: tundranerd/febio-workflows/.github/workflows/windows-reusable-pull-request.yml@oidc-wip-aws
     with:
       runTests: true
       package-name: febio4

diff --git a/.github/workflows/windows-push.yml b/.github/workflows/windows-push.yml
@@ -17,7 +17,7 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable.yml@develop
+    uses: tundranerd/febio-workflows/.github/workflows/windows-reusable-push.yml@oidc-wip-aws
     with:
       runTests: ${{ inputs.runTests == 'true' }}
       package-name: febio4

diff --git a/FEBio/breakpoint.cpp b/FEBio/breakpoint.cpp
@@ -170,7 +170,6 @@ int check_break(int nwhen, double t)
 				return i;
 			}
 		}
-	}
-
+    }
 	return -1;
 }
diff --git a/ci/Linux/build.sh b/ci/Linux/build.sh
@@ -1,6 +1,7 @@
 #! /bin/bash
 # Uncomment next line if not global on target machine
-git config --global --add safe.directory /FEBio
+set -e
+#git config --global --add safe.directory /FEBio
 source "/opt/intel/oneapi/setvars.sh" --force
 cmake . -B cmbuild -LA
 pushd cmbuild

diff --git a/ci/Linux/create-sdk.sh b/ci/Linux/create-sdk.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 TARGET_DIR="${TARGET_DIR:-febio4-sdk}"
 mkdir -p ${TARGET_DIR}/{include,lib,bin}
 # Gotta use rsync macos cp doesn't support --parent

diff --git a/ci/Linux/publish-to-s3.sh b/ci/Linux/publish-to-s3.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-
-chmod +x artifacts/febio/bin/febio4
+set -e
+chmod +x artifacts/febio4/bin/febio4
 ci/common/linux/publish-to-s3.sh artifacts/febio4
 ci/common/linux/publish-to-s3.sh artifacts/febio4-sdk
diff --git a/ci/Linux/scp-to-repo.sh b/ci/Linux/scp-to-repo.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 scp cmbuild/bin/* repo:~/update2/FEBioStudio2Dev/Linux/stage/bin
 scp cmbuild/lib/* repo:~/update2/FEBioStudio2Dev/Linux/stage/lib
 ssh repo "chmod +x update2/FEBioStudio2Dev/Linux/stage/bin/febio4"
diff --git a/ci/Linux/test.sh b/ci/Linux/test.sh
@@ -1,5 +1,6 @@
 #! /bin/bash
 # Uncomment next line if not global on target machine
+set -e
 source "/opt/intel/oneapi/setvars.sh" --force
 ls -lr cmbuild
 chmod +x cmbuild/bin/febio4
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,7 +170,6 @@ int check_break(int nwhen, double t) @@
     				return i;
     			}
     		}
-    	}
+        }
     	return -1;
     }