Skip to content

Commit 6420ca9

Browse files
authored
Merge branch 'master' into 25_04_fix_compilation_regarding_5372
2 parents 1a3b1a8 + 077c958 commit 6420ca9

4 files changed

Lines changed: 28 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
path: ${{ env.WORKSPACE_SRC_PATH }}
3232

3333
- name: Build and install
34+
id: build-and-install
3435
shell: bash
3536
run: |
3637
if [[ "$RUNNER_OS" == "Windows" ]]; then
@@ -72,12 +73,14 @@ jobs:
7273
echo "artifact_name=$artifact_name" >> $env:GITHUB_OUTPUT
7374
7475
- name: Create artifact
76+
id: create-artifact
7577
uses: actions/upload-artifact@v4.4.0
7678
with:
7779
name: ${{ steps.sanitize.outputs.artifact_name }}
7880
path: ${{ env.WORKSPACE_INSTALL_PATH }}
7981

8082
- name: Install artifact
83+
id: install-artifact
8184
uses: actions/download-artifact@v4.1.7
8285
with:
8386
name: ${{ steps.sanitize.outputs.artifact_name }}
@@ -99,6 +102,29 @@ jobs:
99102
echo '----------------------'
100103
python -c "import sys; print('sys.version = ' + str(sys.version)); print('sys.path = ' + str(sys.path))"
101104
105+
- name: Notify dashboard
106+
if: always() && startsWith(github.repository, 'SofaDefrost') && startsWith(github.ref, 'refs/heads/master') # we are not on a fork and on master
107+
env:
108+
DASH_AUTH: ${{ secrets.PLUGIN_DASH }}
109+
shell: bash
110+
run: |
111+
build_status=$([ '${{ steps.build-and-install.outcome }}' == 'success' ] && \
112+
echo 'true' || echo 'false')
113+
114+
binary_status=$([ '${{ steps.create-artifact.outcome }}' == 'success' ] && \
115+
[ '${{ steps.install-artifact.outcome }}' == 'success' ] && \
116+
[ '${{ steps.sanitize.outcome }}' == 'success' ] && \
117+
echo 'true' || echo 'false')
118+
119+
120+
curl -X POST -H "X-API-KEY: $DASH_AUTH" -H "Content-Type: application/json" -d \
121+
"{\"id\":\"$(echo "${{ github.repository }}" | awk -F/ '{ print $2 }')\",\
122+
\"github_ref\":\"${{ github.sha }}\",\
123+
\"url\":\"https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\",\
124+
\"build\":$build_status,\
125+
\"binary\":$binary_status}"\
126+
https://sofa-framework.org:5000/api/v1/plugins
127+
102128
deploy:
103129
name: Deploy artifacts
104130
if: always() && startsWith(github.repository, 'SofaDefrost') && (startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/tags/')) # we are not on a fork and on a branch or a tag (not a PR)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<br>
44

55
[![Documentation](https://img.shields.io/badge/doc-on_website-green.svg)](https://modelorderreduction.readthedocs.io/en/latest/index.html)
6-
[![Gitter](https://img.shields.io/badge/chat-on_Gitter-ff69b4.svg)](https://app.gitter.im/#/room/#model-order-reduction:gitter.im)
6+
[![Discord](https://img.shields.io/badge/chat-on_Discord-darkred.svg)](https://discord.com/channels/1196920567614419024/1196922978731049020)
77
[![Support](https://img.shields.io/badge/support-on_GitHub_Discussions-blue.svg)](https://github.com/sofa-framework/sofa/discussions/categories/modelorderreduction)
88

99
![download](https://img.shields.io/github/downloads/SofaDefrost/ModelOrderReduction/total.svg)

examples/RegressionStateScenes.regression-tests

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/ModelOrderReduction/component/contact/MORUnilateralInteractionConstraint.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ class MORUnilateralInteractionConstraint : public UnilateralLagrangianConstraint
7979
typedef core::behavior::BaseConstraint::VecConstraintBlockInfo VecConstraintBlockInfo;
8080
typedef core::behavior::BaseConstraint::VecPersistentID VecPersistentID;
8181

82+
8283
typedef core::objectmodel::Data<VecCoord> DataVecCoord;
8384
typedef core::objectmodel::Data<VecDeriv> DataVecDeriv;
8485
typedef core::objectmodel::Data<MatrixDeriv> DataMatrixDeriv;

0 commit comments

Comments
 (0)