Merge pull request #1409 from GMLC-TDC/develop

Develop

.ci/.drone.yml

@@ -6,30 +6,30 @@ platform:
   arch: arm
 
 steps:
-- name: uname
-  image: alpine
-  commands:
-  - uname -a
+  - name: uname
+    image: alpine
+    commands:
+      - uname -a
 
-- name: submodules
-  image: docker:git
-  commands:
-  # for updating submodules to latest upstream, add --remote
-  - git submodule update --init --recursive
+  - name: submodules
+    image: docker:git
+    commands:
+      # for updating submodules to latest upstream, add --remote
+      - git submodule update --init --recursive
 
-- name: build
-  image: alpine
-  commands:
-  - apk update
-  - apk add --no-cache build-base git bash cmake ninja boost-dev zeromq-dev
-  - gcc --version || echo "gcc not installed"
-  - clang --version || echo "clang not installed"
-  - cmake --version
-  - git --version
-  - mkdir build && cd build
-  - cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
-  - cmake --build .
-  - ctest -L Continuous --output-on-failure
+  - name: build
+    image: alpine
+    commands:
+      - apk update
+      - apk add --no-cache build-base git bash cmake ninja boost-dev zeromq-dev
+      - gcc --version || echo "gcc not installed"
+      - clang --version || echo "clang not installed"
+      - cmake --version
+      - git --version
+      - mkdir build && cd build
+      - cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
+      - cmake --build .
+      - ctest -L Continuous --output-on-failure
 
 ---
 kind: pipeline
@@ -40,27 +40,27 @@ platform:
   arch: arm64
 
 steps:
-- name: uname
-  image: alpine
-  commands:
-  - uname -a
+  - name: uname
+    image: alpine
+    commands:
+      - uname -a
 
-- name: submodules
-  image: docker:git
-  commands:
-  # for updating submodules to latest upstream, add --remote
-  - git submodule update --init --recursive
+  - name: submodules
+    image: docker:git
+    commands:
+      # for updating submodules to latest upstream, add --remote
+      - git submodule update --init --recursive
 
-- name: build
-  image: alpine
-  commands:
-  - apk update
-  - apk add --no-cache build-base git bash cmake ninja boost-dev zeromq-dev
-  - gcc --version || echo "gcc not installed"
-  - clang --version || echo "clang not installed"
-  - cmake --version
-  - git --version
-  - mkdir build && cd build
-  - cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
-  - cmake --build .
-  - ctest -L Continuous --output-on-failure
+  - name: build
+    image: alpine
+    commands:
+      - apk update
+      - apk add --no-cache build-base git bash cmake ninja boost-dev zeromq-dev
+      - gcc --version || echo "gcc not installed"
+      - clang --version || echo "clang not installed"
+      - cmake --version
+      - git --version
+      - mkdir build && cd build
+      - cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
+      - cmake --build .
+      - ctest -L Continuous --output-on-failure

.ci/azure-pipelines.yml

@@ -1,98 +1,98 @@
 jobs:
-- job: Windows
-  strategy:
-    matrix:
-      VS2017-32bit:
-        imageName: "vs2017-win2016"
-        langArch: "x86"
-        vsArch: "Win32"
-      VS2017-64bit:
-        imageName: "vs2017-win2016"
-        langArch: "x64"
-        vsArch: "x64"
-      VS2019-64bit:
-        imageName: "windows-2019"
-        langArch: "x64"
-        vsArch: "x64"
-  pool:
-    vmImage: $(imageName)
+  - job: Windows
+    strategy:
+      matrix:
+        VS2017-32bit:
+          imageName: 'vs2017-win2016'
+          langArch: 'x86'
+          vsArch: 'Win32'
+        VS2017-64bit:
+          imageName: 'vs2017-win2016'
+          langArch: 'x64'
+          vsArch: 'x64'
+        VS2019-64bit:
+          imageName: 'windows-2019'
+          langArch: 'x64'
+          vsArch: 'x64'
+    pool:
+      vmImage: $(imageName)
 
-  steps:
-  # -----------------------
-  # Install dependencies
-  # -----------------------
-  - bash: choco install swig --yes --limit-output
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
-    displayName: Install swig
-
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.5'
-      addToPath: true
-      architecture: $(langArch)
-
-  - bash: pip3 install pytest
-    displayName: Install pytest
+    steps:
+      # -----------------------
+      # Install dependencies
+      # -----------------------
+      - bash: choco install swig --yes --limit-output
+        condition: eq( variables['Agent.OS'], 'Windows_NT' )
+        displayName: Install swig
 
-  # -----------------------
-  # Configure HELICS
-  # -----------------------
-  - bash: |
-      echo "##vso[task.setvariable variable=BOOST_ROOT]$BOOST_ROOT_1_72_0"
-  - task: CMake@1
-    inputs:
-      cmakeArgs: -A $(vsArch) -DHELICS_ENABLE_SWIG=ON -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
-    displayName: 'Configure HELICS'
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
-
-#  - task: CMake@1
-#    inputs:
-#      cmakeArgs: -DBUILD_PYTHON_INTERFACE=ON .
-#    displayName: 'Configure Python interface'
-#    condition: and(ne( variables['imageName'], 'vs2015-win2012r2' ), eq( variables['langArch'], 'x64' ))
-
-#  - task: CMake@1
-#    inputs:
-#      cmakeArgs: -DBUILD_JAVA_INTERFACE=ON .
-#    displayName: 'Configure Java interface'
-#    condition: eq( variables['langArch'], 'x64' )
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: '3.5'
+          addToPath: true
+          architecture: $(langArch)
 
-  # -----------------------
-  # Build HELICS
-  # -----------------------
-  - bash: cmake --build . --config Release
-    displayName: 'Build HELICS'
-    workingDirectory: build
-
-  # -----------------------
-  # Package HELICS
-  # -----------------------
-  - bash: |
-      cpack_dir="$(which cmake)"
-      cpack_dir="${cpack_dir%/cmake}"
-      "${cpack_dir}/cpack" -G "NSIS" -C Release -B "$PWD/installer-output"
-    displayName: 'Package HELICS'
-    workingDirectory: build
-    
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: '$(Build.SourcesDirectory)/build/installer-output'
-      contents: '*.exe'
-      TargetFolder: '$(Build.ArtifactStagingDirectory)'
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: '$(Build.ArtifactStagingDirectory)'
-      artifactName: installer
-
-  # -----------------------
-  # Test HELICS
-  # -----------------------
-  - bash: ctest --output-on-failure --timeout 480 -C Release -L "Continuous"
-    displayName: 'Test HELICS'
-    workingDirectory: build
-
-  # Packaging tests
-  - bash: ctest --output-on-failure --timeout 480 -C Release -L "PackagingFast"
-    displayName: 'Test HELICS packaging'
-    workingDirectory: build
+      - bash: pip3 install pytest
+        displayName: Install pytest
+
+      # -----------------------
+      # Configure HELICS
+      # -----------------------
+      - bash: |
+          echo "##vso[task.setvariable variable=BOOST_ROOT]$BOOST_ROOT_1_72_0"
+      - task: CMake@1
+        inputs:
+          cmakeArgs: -A $(vsArch) -DHELICS_ENABLE_SWIG=ON -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
+        displayName: 'Configure HELICS'
+        condition: eq( variables['Agent.OS'], 'Windows_NT' )
+
+      #  - task: CMake@1
+      #    inputs:
+      #      cmakeArgs: -DBUILD_PYTHON_INTERFACE=ON .
+      #    displayName: 'Configure Python interface'
+      #    condition: and(ne( variables['imageName'], 'vs2015-win2012r2' ), eq( variables['langArch'], 'x64' ))
+
+      #  - task: CMake@1
+      #    inputs:
+      #      cmakeArgs: -DBUILD_JAVA_INTERFACE=ON .
+      #    displayName: 'Configure Java interface'
+      #    condition: eq( variables['langArch'], 'x64' )
+
+      # -----------------------
+      # Build HELICS
+      # -----------------------
+      - bash: cmake --build . --config Release
+        displayName: 'Build HELICS'
+        workingDirectory: build
+
+      # -----------------------
+      # Package HELICS
+      # -----------------------
+      - bash: |
+          cpack_dir="$(which cmake)"
+          cpack_dir="${cpack_dir%/cmake}"
+          "${cpack_dir}/cpack" -G "NSIS" -C Release -B "$PWD/installer-output"
+        displayName: 'Package HELICS'
+        workingDirectory: build
+
+      - task: CopyFiles@2
+        inputs:
+          sourceFolder: '$(Build.SourcesDirectory)/build/installer-output'
+          contents: '*.exe'
+          TargetFolder: '$(Build.ArtifactStagingDirectory)'
+
+      - task: PublishBuildArtifacts@1
+        inputs:
+          pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+          artifactName: installer
+
+      # -----------------------
+      # Test HELICS
+      # -----------------------
+      - bash: ctest --output-on-failure --timeout 480 -C Release -L "Continuous"
+        displayName: 'Test HELICS'
+        workingDirectory: build
+
+      # Packaging tests
+      - bash: ctest --output-on-failure --timeout 480 -C Release -L "PackagingFast"
+        displayName: 'Test HELICS packaging'
+        workingDirectory: build

.ci/undef_blacklist.txt

@@ -1 +1 @@
-src:*/libzmq/*
+src:*/libzmq/*

.circleci/asan_blacklist.txt

@@ -2,4 +2,4 @@ src:*/libzmq/*
 src:*/*/badInputTests*
 fun:*getMessageObj*
 [undefined]
-fun:*helicsFederateRegister*
+fun:*helicsFederateRegister*