Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main dev #343

Merged
merged 205 commits into from
Oct 20, 2023
Merged
Changes from 1 commit
Commits
Show all changes
205 commits
Select commit Hold shift + click to select a range
5ec98c8
Added build workflow
wsobel Jul 18, 2023
2176e3d
Merge pull request #291 from mtconnect/github-actions
wsobel Jul 18, 2023
fcbb1ca
Added conan profile detect
wsobel Jul 18, 2023
5a46354
checkpoint with successful build
wsobel Jul 18, 2023
4d81b7e
Merge remote-tracking branch 'origin/add-dynamic-device-creation-for-…
wsobel Jul 18, 2023
73f309e
Working tests with conan create
wsobel Jul 18, 2023
f3e5684
fixed cpack destination directory and added script to get the zip file
wsobel Jul 19, 2023
639d2fe
updated workflow to use create and matrix shared
wsobel Jul 19, 2023
99ad2eb
Merge pull request #292 from mtconnect/conan2_test_package_support
wsobel Jul 19, 2023
3e02fa5
changed shared flags to string
wsobel Jul 19, 2023
fcac464
added build for macos
wsobel Jul 19, 2023
1dbfa19
added build for macos
wsobel Jul 19, 2023
74379da
fixed shared for non-matrixed build.
wsobel Jul 19, 2023
225e5a9
fixed shared for non-matrixed build.
wsobel Jul 19, 2023
8b07a48
Added windows runner
wsobel Jul 19, 2023
61016a7
Added generators
wsobel Jul 19, 2023
a593cf4
Added setup of msbuild to address path issues
wsobel Jul 20, 2023
7f79adf
More windows fixes
wsobel Jul 20, 2023
28f0845
Check path for windows build
wsobel Jul 20, 2023
9d6516f
Install ruby 3.1
wsobel Jul 20, 2023
919bede
Install ruby 3.1
wsobel Jul 20, 2023
748afc1
Install ruby 3.1
wsobel Jul 20, 2023
633752b
shared tests function
wsobel Jul 21, 2023
571a431
Fixed shared test and transitive requirements
wsobel Jul 23, 2023
94599e0
Find cl.exe in path
wsobel Jul 23, 2023
f1fbd1c
Just build mruby
wsobel Jul 23, 2023
34ea72e
Check path
wsobel Jul 23, 2023
21a3cf3
added check for files in dir
wsobel Jul 23, 2023
c1dd3b3
added check for files in dir
wsobel Jul 23, 2023
57b8f4b
Try to find CL
wsobel Jul 23, 2023
ab0f282
Check paths differently
wsobel Jul 23, 2023
3d19c5d
Check vswhere
wsobel Jul 23, 2023
b5ae17f
Use vs dev env action
wsobel Jul 23, 2023
c253a08
Restore remaining build steps
wsobel Jul 23, 2023
cd041d9
Update build.yml
wsobel Jul 23, 2023
22de769
Update build.yml
wsobel Jul 23, 2023
880b04b
Update build.yml
wsobel Jul 23, 2023
f1526f2
Added clang as profile
wsobel Jul 23, 2023
ce98bbc
Added shared matrix
wsobel Jul 23, 2023
7044fcf
added additional support for shared linux and windows
wsobel Jul 24, 2023
534404d
made gtest shared as transitive
wsobel Jul 24, 2023
b987e79
removed shared windows build until can validate on windows
wsobel Jul 24, 2023
181d9db
Removed shared build
wsobel Jul 24, 2023
d05d110
Merge pull request #293 from mtconnect/fix_shared_build_for_ci_cd
wsobel Jul 24, 2023
48ab319
Fixed MSDEV shared build
wsobel Jul 24, 2023
95633dc
Merge pull request #294 from mtconnect/fix_shared_build_for_ci_cd
wsobel Jul 24, 2023
eb1ce84
Added workflow build badge
wsobel Jul 24, 2023
74c11a0
began modifying workflow
wsobel Jul 24, 2023
3ef2041
Version 2.2 Release Tag
wsobel Jul 24, 2023
c643b06
Created option 'include_tests' to include the tests as a sub-project …
wsobel Aug 3, 2023
f9d246a
merged main
wsobel Aug 4, 2023
425a9a4
Tests now work with package or as part of main build
wsobel Aug 4, 2023
f391e1b
Version 2.2.0.4
wsobel Aug 4, 2023
b830c43
Removed CD phase of release for now
wsobel Aug 4, 2023
1c07a7a
Fixed github release version
wsobel Aug 4, 2023
264bbd3
Had to remove release package, seems to be broken
wsobel Aug 4, 2023
8f1c9e8
Changed from include_tests to development as the option for build tests
wsobel Aug 4, 2023
00e7660
Merge pull request #302 from mtconnect/add_deploy_release_cd_workflow
wsobel Aug 4, 2023
e58c23c
Checkpoint for docker image and install fix
wsobel Aug 5, 2023
3285904
New docker build now works for ubuntu
wsobel Aug 6, 2023
625a9ad
Added tests to end of the developemnt build
wsobel Aug 6, 2023
d66ebc0
Changed windows build to use 2 jobs because of test failures.
wsobel Aug 6, 2023
f1737b7
added caches
wsobel Aug 6, 2023
1df5f8a
Added zip as a apt package for the Dockerfile
wsobel Aug 6, 2023
5c696e7
feat: update the Dockerfiles to `v2.2.`
ottobolyos Aug 7, 2023
2e3044a
changes for packaging
wsobel Aug 7, 2023
7668552
fix: remove `WITH_TESTS` arg from Dockerfiles
ottobolyos Aug 7, 2023
fc638c2
Changed build for CD to 32 and 64 bit builds
wsobel Aug 8, 2023
d695416
Removed shared with windows
wsobel Aug 8, 2023
b7cc173
Merge pull request #304 from ottobolyos/dockerfile
wsobel Aug 9, 2023
13eafc9
Merge branch 'main' into update_docker_file_for_2_2
wsobel Aug 9, 2023
318c249
Added automatic release packaging when tagged and caching for faster …
wsobel Aug 11, 2023
73bcb2a
Merge branch 'main' into add_deploy_release_cd_workflow
wsobel Aug 11, 2023
8fdb16f
Changed a few things in the Dockerfile. Will need more work in the do…
wsobel Aug 11, 2023
0cd65c7
Merge pull request #303 from mtconnect/add_deploy_release_cd_workflow
wsobel Aug 11, 2023
6db195f
updated build.yml zip env reference
wsobel Aug 11, 2023
5cf3b16
updated buid.yml referencing the zip directory
wsobel Aug 11, 2023
31fec2b
Fixed windows packaging
wsobel Aug 11, 2023
ac77275
Merge branch 'main' into update_docker_file_for_2_2
wsobel Aug 12, 2023
b58b73d
Added some more structure to the installer
wsobel Aug 12, 2023
3dfe46f
Added cpack and conan options for the name and destination
wsobel Aug 12, 2023
7ac4cc3
Initial path handling for configuring the agent directories
wsobel Aug 14, 2023
3fb3f89
Updated dockerfile with options using new configuration expansion and…
wsobel Aug 14, 2023
bd9265a
removed the shell at the end of the CMD
wsobel Aug 14, 2023
d8a1118
Use explicit return for lambdas in sink contract creation
wsobel Aug 14, 2023
5c6f179
fixed windows build issue
wsobel Aug 14, 2023
1425a9a
Fixed windows build error
wsobel Aug 14, 2023
187c71b
Changed from setenv to putenv and fixed option default
wsobel Aug 15, 2023
95095dc
Fixed occasional error in agent adapter test on mac
wsobel Aug 15, 2023
d9ad49e
Update Dockerfile
wsobel Aug 15, 2023
b013544
Update Dockerfile
wsobel Aug 15, 2023
3c22e85
Update Dockerfile
wsobel Aug 15, 2023
96f2163
first cut at alpine dockerfile with conan 2 fixes. fixed issue in Doc…
wsobel Aug 15, 2023
97c55b0
Fixed apline build
wsobel Aug 15, 2023
6b5a386
Synchronized the dockerfiles and fixed alpine build issue adding gcom…
wsobel Aug 15, 2023
0174335
Cleaned up docker files
wsobel Aug 15, 2023
8866136
Cleaned up label
wsobel Aug 15, 2023
e22226f
Added runtime C++ libraries to release build
wsobel Aug 15, 2023
b124a14
Bumped version to 2.2.0.5
wsobel Aug 15, 2023
5f02c8e
Merge pull request #306 from mtconnect/update_docker_file_for_2_2
wsobel Aug 16, 2023
4bbe695
Fixed issues with boost placeholders.
wsobel Aug 16, 2023
0589134
Added a job name to the workflow
wsobel Aug 16, 2023
19d9ade
Added BOOST_BIND_NO_PLACEHOLDERS to prevent use of legacy placeholder…
wsobel Aug 16, 2023
6d31e27
Improved configuration file variable expansion
wsobel Aug 16, 2023
85dec59
Improved configuration file variable expansion
wsobel Aug 16, 2023
9d035f9
Exclude build directories from exports
wsobel Aug 17, 2023
be9274d
Added WITH_TESTS flag to docker and added dependency in test_package …
wsobel Aug 17, 2023
ad71370
removed echo of testing flag
wsobel Aug 17, 2023
e01c138
Merge pull request #311 from mtconnect/upgrade_boost_to_1_82
wsobel Aug 18, 2023
2fe6682
Update README.md with 2.2 content.
wsobel Aug 18, 2023
ee628ca
Cleaned up shared lib install
wsobel Aug 20, 2023
70a286c
Cleaned up Dockerfiles.
wsobel Aug 20, 2023
9683176
Started compose and added AgentDeviceUUID
wsobel Aug 23, 2023
c25e921
Added docker compose under docker and general ubuntu and alpine docke…
wsobel Aug 23, 2023
56f93d1
Removed old simulator files since they are outdated
wsobel Aug 23, 2023
843c892
Moved compose to demo since it composes the demo
wsobel Aug 23, 2023
c1a7fef
Agent adapter can now support multiple devices
wsobel Aug 26, 2023
9cc27e1
Add build args UID and GID
rwuthric Aug 29, 2023
4428f1b
#301 MQTT Sink - username/password missing from wire
rajwork9 Aug 31, 2023
f7894b8
added automatic json version parsing for twin demo
wsobel Sep 4, 2023
7b36d65
fixed component relationships
wsobel Sep 4, 2023
7b4fd1d
Switch all default cfgs to json v2
wsobel Sep 4, 2023
5a19da2
Added some documentation and version 2.2.0.6
wsobel Sep 4, 2023
8da96a2
Merge pull request #315 from mtconnect/main-dev-readme-codition-update
wsobel Sep 4, 2023
31891a3
Merge branch 'main' into main-dev
wsobel Sep 4, 2023
0532c5d
Modified all variants of dockerfiles in accordance with PR #316
wsobel Sep 4, 2023
53e0647
Added test for AgentDeviceUUID
wsobel Sep 4, 2023
12473dc
Merge pull request #316 from rwuthric/main
wsobel Sep 4, 2023
5e13f3e
Fixing docker with UID for alpine
wsobel Sep 4, 2023
5927509
Merge branch 'main' into docker_with_shared_libs_volumes
wsobel Sep 4, 2023
063516a
Formatted ubuntu dockerfile
wsobel Sep 4, 2023
ca7bbeb
cleaned up docker files
wsobel Sep 4, 2023
4daf1b9
Merge branch 'main' into main
wsobel Sep 4, 2023
29e05b9
Merge pull request #320 from mtconnect/docker_with_shared_libs_volumes
wsobel Sep 4, 2023
c208b54
Merge branch 'main' into main
wsobel Sep 4, 2023
cc37661
Merge pull request #319 from rajwork9/main
wsobel Sep 5, 2023
a3ff0b0
Added square_ unit prefix conversions
wsobel Sep 6, 2023
9545360
Merge branch 'main' into main-dev
wsobel Sep 6, 2023
a3e71af
first refactor to separate out async observation from rest service
wsobel Sep 10, 2023
3e49d92
Next checkpoint for async observer refactor
wsobel Sep 12, 2023
109bd14
checkpoint with refactor of async observer to remove sink and contrac…
wsobel Sep 12, 2023
5bd2e71
Moved change observer test to observation
wsobel Sep 12, 2023
2b65496
Cleaned up observe method for async observer
wsobel Sep 12, 2023
0208167
Merge pull request #321 from mtconnect/add_square_units
shaurabhsingh Sep 12, 2023
af48506
Added some tests for initial cut of async observer
wsobel Sep 14, 2023
8733a39
Added test for shutdown
wsobel Sep 14, 2023
62381db
Added Mqtt2Service
rajwork9 Sep 14, 2023
f26e190
Merge remote-tracking branch 'rajani/main' into mqtt_releated_version_2
wsobel Sep 14, 2023
c1f8d40
some modification with probe print...
rajwork9 Sep 15, 2023
4484fff
Added new configuration for MQTT Topics
wsobel Sep 15, 2023
e291586
Merge remote-tracking branch 'rajani/main' into mqtt_releated_version_2
wsobel Sep 15, 2023
356898c
First cut of working mqtt 2 sink
wsobel Sep 16, 2023
1b59020
Rename intervals with Mqtt prefix
wsobel Sep 16, 2023
4b84b46
Changed from MTConnect/Device/... to MTConnect/Probe/... for consistency
wsobel Sep 16, 2023
70c8b91
Fixed filters for content
wsobel Sep 16, 2023
876ac5d
Changed default current interval 10s
wsobel Sep 16, 2023
51a09e8
Prefix Agent device uuid with Agent. Add device for assets in topic
wsobel Sep 17, 2023
0ee7328
Hardened shutdown and disconnect handling
wsobel Sep 17, 2023
5d74bcc
Fixed tests for mqtt 2 sink
wsobel Sep 17, 2023
9ef496e
Topics are now with {device} formatting
wsobel Sep 17, 2023
a39b430
added fallback when {device} not given
wsobel Sep 17, 2023
0020eee
fixed test setup for mqtt 2
wsobel Sep 17, 2023
18a4042
Changed from {device} to [device] in topics because of config parser …
wsobel Sep 17, 2023
4ee8de1
fixed asset topic format
wsobel Sep 17, 2023
e3ef582
optimized get observations for checkpoint when filter set is given
wsobel Sep 17, 2023
87781e2
Formatted code
wsobel Sep 17, 2023
34ffae2
fixed period filter edge conditions
wsobel Sep 21, 2023
3b072fe
Fixed Mqtt sink test binding to port 7878
wsobel Sep 21, 2023
1ad3bd5
Cleaned up code for filtering periods
wsobel Sep 22, 2023
57e0e8b
updated documentation for mqtt 2 sink
wsobel Sep 22, 2023
ee12a8d
Added more docs
wsobel Sep 22, 2023
babdf15
Added support for json and xml configration files
wsobel Sep 22, 2023
021339b
Added bigobj for mqtt2 sink
wsobel Sep 22, 2023
8b224f2
json support with simple test
wsobel Sep 22, 2023
c48db36
Check if sink is viable and running before sending failing back to se…
wsobel Sep 22, 2023
3a03b94
Added guard to make sure timing works.
wsobel Sep 22, 2023
1d48322
Turned on output on failure
wsobel Sep 22, 2023
63a3eca
set environment variable
wsobel Sep 22, 2023
5194855
Fixed issues with *nix test builds and RPATH
wsobel Sep 23, 2023
e0ab73c
do not set --disable-new-dtags for apple
wsobel Sep 23, 2023
7f63e1a
Added extra check in change observer test
wsobel Sep 24, 2023
47f2e50
Fixed timing on async observer test
wsobel Sep 24, 2023
1be8f8b
added more time for failed test
wsobel Sep 24, 2023
4908704
Try another attempt to with the windows failure
wsobel Sep 24, 2023
5fc564d
build fix for windows
rajwork9 Sep 25, 2023
6d1a439
build fix for windows
rajwork9 Sep 25, 2023
1e78eb0
build fail: revert back changes due to differences in configurations …
rajwork9 Sep 26, 2023
88c1752
refactored timers
wsobel Sep 26, 2023
d7d9dc4
made changes for windows shared build
wsobel Sep 28, 2023
4f8e6f6
changed timing in period filter test for windows shared
wsobel Sep 29, 2023
5ce4880
changed change observer test to properly handle async small chunks
wsobel Sep 29, 2023
af864dd
Merge pull request #327 from mtconnect/mqtt_releated_version_2
wsobel Sep 29, 2023
ad259ac
Merge branch 'main' into json_configuration_file
wsobel Sep 29, 2023
3fb50dd
Added string to ends with in agent config.
wsobel Sep 29, 2023
c427982
Fixed ends with and fs path.
wsobel Sep 29, 2023
060ed4d
Merge pull request #331 from mtconnect/json_configuration_file
wsobel Sep 29, 2023
e65463d
Version 2.2.0.7
wsobel Sep 29, 2023
ff7f878
Merge branch 'main' into main-dev
wsobel Oct 3, 2023
c0db9e7
Added support for conditionId in version 2.3 and native code field in…
wsobel Oct 3, 2023
2d4e473
default condition code to condition id when creating condition observ…
wsobel Oct 4, 2023
769a93a
Merge pull request #332 from mtconnect/version-2.3-adding-condition-i…
wsobel Oct 5, 2023
cac6065
Updated condition shdr format for the addition of condition_id to the…
dwickelhaus Oct 16, 2023
bf04910
Corrected SHDR pattern conditions and the condtion_id parameter
dwickelhaus Oct 17, 2023
9a8e22a
Removed * from the comments under the adapter condition shdr examples.
dwickelhaus Oct 17, 2023
112b841
Merge pull request #344 from mtconnect/condition_id_shdr_readme_update
wsobel Oct 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added check for files in dir
wsobel committed Jul 23, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit c1dd3b364852777a4507bdc6221fb4486f94e884
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -26,10 +26,10 @@ jobs:
- name: Initialize MSDEV
uses: microsoft/[email protected]

- name: Install ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1'
# - name: Install ruby
# uses: ruby/setup-ruby@v1
# with:
# ruby-version: '3.1'

- name: Build and Test C++ Agent
run: |
1 change: 1 addition & 0 deletions conan/mruby/conanfile.py
Original file line number Diff line number Diff line change
@@ -51,6 +51,7 @@ def generate(self):
f.write('''
# Work around possible onigmo regex package already installed somewhere
puts "*************"
p Dir.pwd
p ENV['PATH']
ENV['PATH'].split(';').each do |pth|
puts "Path: #{pth}"