Merge pull request #2481 from GMLC-TDC/develop

Develop

.ci/azure-pipelines.yml

@@ -197,7 +197,7 @@ jobs:
       # -----------------------
       # Test HELICS
       # -----------------------
-      - bash: ctest --output-on-failure --timeout 1000 -C Release -L "Continuous"
+      - bash: ctest --output-on-failure --timeout 440 -C Release -L "Continuous"
         displayName: 'Test HELICS'
         workingDirectory: build
 

.circleci/config.yml

@@ -37,7 +37,7 @@ aliases:
   - &run_helics_tests
     name: run_helics_tests
     command: |
-      /root/project/scripts/run-circleci-tests.sh
+      scripts/run-circleci-tests.sh build
       RESULT=$?
       exit $RESULT
 
@@ -215,6 +215,20 @@ jobs:
       - store_artifacts:
           path: /tmp/bm_results
 
+  arm64:
+    machine:
+      image: ubuntu-2004:current
+    resource_class: arm.medium
+    environment:
+      CMAKE_FLAGS: '-DHELICS_BUILD_CXX_SHARED_LIB=OFF -DHELICS_BUILD_TESTS=ON -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ZMQ_FORCE_SUBPROJECT=ON -DHELICS_DISABLE_BOOST=ON'
+    steps:
+      - checkout
+      - run: *setup_helics
+      - run: *run_helics_tests
+      - run:
+          name: system info
+          command: build/bin/helics_app --system
+
 workflows:
   version: 2
   helics_test:
@@ -300,6 +314,7 @@ workflows:
       - helicsgccASan
       - helicsgccTSan
       - helicsMSan
+      - arm64
   benchmark:
     triggers:
       - schedule:

.gitmodules

@@ -7,7 +7,7 @@
 [submodule "ThirdParty/containers"]
     path = ThirdParty/containers
     url = ../../GMLC-TDC/containers.git
-    branch = master
+    branch = main
 [submodule "ThirdParty/concurrency"]
     path = ThirdParty/concurrency
     url = ../../GMLC-TDC/concurrency.git

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
     hooks:
       - id: remove-tabs
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-added-large-files
       - id: mixed-line-ending
@@ -40,7 +40,7 @@ repos:
       - id: detect-private-key
         exclude: ^(tests/helics/test_files/encryption_config/openssl_certs/)
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.2
+    rev: v3.0.0-alpha.4
     hooks:
       - id: prettier
         exclude: ^(docs/user-guide/examples/user_guide_examples)
@@ -74,7 +74,7 @@ repos:
             "--exclude-file=./config/spelling_ignorelines.txt",
           ]
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v14.0.6
+    rev: v15.0.4
     hooks:
       - id: clang-format
         types:

CHANGELOG.md

@@ -1,13 +1,35 @@
 # Changelog
 
-All notable changes to this project after the 1.0.0 release will be documented in this file
+All notable changes to this project after the 3.0.0 release will be documented in this file
+The changelog for HELICS 1.X and 2.X can be found [here](./docs/HELICS2_CHANGELOG.md)
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 A note on future revisions.
 Everything within a major version number should be code compatible (with the exception of experimental interfaces). The most notable example of an experimental interface is the support for multiple source inputs. The APIs to deal with this will change in future minor releases. Everything within a single minor release should be network compatible with other federates on the same minor release number. Compatibility across minor release numbers may be possible in some situations but we are not going to guarantee this as those components are subject to performance improvements and may need to be modified at some point. Patch releases will be limited to bug fixes and other improvements not impacting the public API or network compatibility. Check the [Public API](./docs/Public_API.md) for details on what is included and excluded from the public API and version stability.
 
+## [3.3.2][] ~ 2022-12-02
+
+Patch release to fix some testing issues and add some network probing capabilities and remote terminal connections.
+
+### Fixed
+
+- Fixed a few sporadically failing CI tests
+
+### Changed
+
+- Update containers library
+- Update the units library
+- Split the application API tests in a set of 4 smaller tests to reduce test runtime and ease maintenance.
+
+### Added
+
+- Added a remote terminal capability to link with a remote Broker server running a rest API.
+- Added ARM based Circle CI test.
+- Added a probe app for testing some networking situations and connections.
+- Added tests for the tcp federate under various conditions.
+
 ## [3.3.1][] ~ 2022-10-21
 
 Patch release to fix some issues with using HELICS as a subproject, and fix a few bugs related to time barriers, and a few other timing issues.
@@ -321,5 +343,4 @@ HELICS 3.0 is a major update to HELICS. The major features that have been added
 [3.2.1]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.2.1
 [3.3.0]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.3.0
 [3.3.1]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.3.1
-
-The changelog for HELICS 1.X and 2.X can be found [here](./docs/HELICS2_CHANGELOG.md)
+[3.3.2]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.3.2

CMakeLists.txt

@@ -17,14 +17,14 @@ if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE AND NOT HELICS_D
     set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
 endif()
 
-project(HELICS VERSION 3.3.1)
+project(HELICS VERSION 3.3.2)
 
 # -----------------------------------------------------------------------------
 # HELICS Version number
 # -----------------------------------------------------------------------------
 set(HELICS_VERSION_BUILD)
 # use ISO date YYYY-MM-DD
-set(HELICS_DATE "2022-10-21")
+set(HELICS_DATE "2022-12-02")
 
 set(HELICS_VERSION_UNDERSCORE
     "${HELICS_VERSION_MAJOR}_${HELICS_VERSION_MINOR}_${HELICS_VERSION_PATCH}"