Skip to content

Commit

Permalink
Merge pull request #19 from bakpaul/fix_bad_indent_ci
Browse files Browse the repository at this point in the history
FIX and clean ci
  • Loading branch information
pasqualeferr94 authored Apr 17, 2024
2 parents c0b5a47 + 893fa15 commit 4caf1e2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 151 deletions.
140 changes: 0 additions & 140 deletions .github/workflow/ci.yml

This file was deleted.

19 changes: 9 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,30 +110,29 @@ jobs:

deploy:
name: Deploy artifacts
if: always() && startsWith(github.ref, 'refs/heads/') # we are on a branch (not a PR)
needs: [build-and-test]
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) needs: [build-and-test]
runs-on: ubuntu-latest
continue-on-error: true
steps:
- name: Get artifacts
uses: actions/download-artifact@v2
with:
uses: actions/download-artifact@v2
with:
path: artifacts

- name: Zip artifacts
shell: bash
run: |
shell: bash
run: |
cd $GITHUB_WORKSPACE/artifacts
for artifact in *; do
zip $artifact.zip -r $artifact/*
zip $artifact.zip -r $artifact/*
done
- name: Upload release
uses: softprops/action-gh-release@v1
with:
uses: softprops/action-gh-release@v1
with:
name: ${{ github.ref_name }}
tag_name: release-${{ github.ref_name }}
fail_on_unmatched_files: false
target_commitish: ${{ github.ref_name }}
target_commitish: ${{ github.sha }}
files: |
artifacts/SofaViscoElastic_*_Linux.zip
artifacts/SofaViscoElastic_*_Windows.zip
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set(SOURCE_FILES
${SOFAVISCOELASTIC_SOURCE_DIR}/TetrahedronViscoelasticityFEMForceField.cpp
)

sofa_find_package(Sofa.Simulation.Core REQUIRED)
find_package(Sofa.Simulation.Core REQUIRED)

sofa_find_package(SofaPython3 QUIET)

Expand Down

0 comments on commit 4caf1e2

Please sign in to comment.