Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
lformaggia committed Jan 8, 2024
2 parents a2db273 + a326a5e commit d034a7a
Show file tree
Hide file tree
Showing 35 changed files with 2,786 additions and 2,460 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=false
48 changes: 48 additions & 0 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: build

on:
push:
paths-ignore:
- '**/*.md'
pull_request:
paths-ignore:
- '**/*.md'

env:
CMAKE_BUILD_TYPE: Debug
CMAKE_BUILD_DIR: ${{ github.workspace }}/build

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macOS-latest]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3

- name: Build
shell: bash
run: |
mkdir -p $CMAKE_BUILD_DIR
cd $CMAKE_BUILD_DIR
cmake -DENABLE_SAMPLES=ON -DENABLE_OPENMP=OFF -DENABLE_WIDE_CHAR=ON -DBUILD_SHARED_LIBS=ON ..
cmake --build .
- name: Run Unit Test
shell: bash
working-directory: ${{ env.CMAKE_BUILD_DIR }}
run: |
if [[ ${{ matrix.os }} == windows* ]]; then
EXAMPLE="$CMAKE_BUILD_TYPE/example1.exe"
else
EXAMPLE="./example1"
fi
$EXAMPLE &> example.log << EOF
quit
EOF
cat example.log
grep -e "Test passed.*expressions" example.log || (grep -e "Test failed.*expressions" example.log; exit 1)
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,19 @@ build/*
out/*
CMakeSettings.json
/build/
CMakeFiles/*
libmuparser.so*
CMakeCache.txt
Makefile
muparser-targets.cmake
muparser.pc
muparserConfig.cmake
muparserConfigVersion.cmake
t_ParserTest
example1
example2
DartConfiguration.tcl
cmake_install.cmake
CTestTestfile.cmake
gitlog.log

11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"files.associations": {
"*.rmd": "markdown",
"stdexcept": "cpp",
"sstream": "cpp"
}
}
Loading

0 comments on commit d034a7a

Please sign in to comment.