Compare commits

..

214 Commits

Author SHA1 Message Date
giles fe653240e4 Merge pull request 'test-push' (#229) from develop/bump-release-fail into master
master-pushed / new release (push) Successful in 10s Details
convert-to-xml / deploy (push) Successful in 21s Details
Reviewed-on: #229
2023-10-25 11:21:37 +00:00
gilesb e9f787b82b test-push
build-develop-branch / build-branch (push) Successful in 40s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
/ prettier (pull_request) Successful in 16s Details
2023-10-25 12:19:52 +01:00
gilesb 381b1211b6 test-push
build-develop-branch / build-branch (push) Waiting to run Details
/ prettier (pull_request) Successful in 16s Details
convert-to-xml / deploy (push) Has been cancelled Details
build-develop-branch / new release (push) Has been cancelled Details
2023-10-25 12:19:20 +01:00
gilesb 3f8a784ea0 test-push
build-develop-branch / build-branch (push) Waiting to run Details
build-develop-branch / new release (push) Waiting to run Details
/ prettier (pull_request) Successful in 16s Details
2023-10-25 12:17:58 +01:00
gilesb 6a76cd6dc2 test-push
build-develop-branch / new release (push) Waiting to run Details
/ prettier (pull_request) Successful in 16s Details
2023-10-25 12:17:23 +01:00
gilesb bf4335c8b8 test-push
/ prettier (pull_request) Successful in 15s Details
convert-to-xml / deploy (push) Has been cancelled Details
build-develop-branch / new release (push) Has been cancelled Details
2023-10-25 12:16:01 +01:00
gilesb f75a54e273 test-push
/ prettier (pull_request) Successful in 17s Details
convert-to-xml / deploy (push) Waiting to run Details
build-develop-branch / new release (push) Has been cancelled Details
2023-10-25 12:15:09 +01:00
gilesb 6f92610c26 test-push
build-develop-branch / new release (push) Failing after 10s Details
/ prettier (pull_request) Successful in 16s Details
2023-10-25 12:14:33 +01:00
gilesb 9c8429ae68 test-push
build-develop-branch / new release (push) Failing after 10s Details
/ prettier (pull_request) Successful in 16s Details
2023-10-25 12:13:22 +01:00
gilesb 369b5ffd29 test-push
/ prettier (pull_request) Successful in 15s Details
convert-to-xml / deploy (push) Failing after 20s Details
build-develop-branch / new release (push) Failing after 12s Details
2023-10-25 12:12:02 +01:00
gilesb e535cb3c62 test-push
/ prettier (pull_request) Successful in 15s Details
convert-to-xml / deploy (push) Failing after 19s Details
build-develop-branch / new release (push) Failing after 10s Details
2023-10-25 12:10:49 +01:00
gilesb d1a1d14664 test-push
build-develop-branch / new release (push) Failing after 10s Details
/ prettier (pull_request) Successful in 15s Details
2023-10-25 12:09:55 +01:00
gilesb 47695a0523 test-push
build-develop-branch / new release (push) Failing after 11s Details
/ prettier (pull_request) Successful in 17s Details
2023-10-25 12:08:49 +01:00
gilesb 7dbab1a28f test-push
build-develop-branch / new release (push) Failing after 10s Details
/ prettier (pull_request) Successful in 15s Details
2023-10-25 12:07:16 +01:00
gilesb e3199a06ec test-push
build-develop-branch / build-branch (push) Successful in 38s Details
build-develop-branch / new release (push) Failing after 11s Details
/ prettier (pull_request) Successful in 17s Details
2023-10-25 12:05:09 +01:00
giles 79136f6882 Merge pull request 'renamed workflows' (#228) from develop/rename-workflows into master
build-develop-branch / new release (push) Failing after 12s Details
Reviewed-on: #228
2023-10-25 10:57:32 +00:00
gilesb f35b8f67af renamed workflows
build-develop-branch / build-branch (push) Successful in 44s Details
/ prettier (pull_request) Successful in 16s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-25 11:54:25 +01:00
gilesb d3c03369aa lflflflf
build-develop-branch / build-branch (push) Successful in 41s Details
/ prettier (pull_request) Successful in 18s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
build-develop-branch / new release (push) Successful in 13s Details
convert-to-xml / deploy (push) Successful in 24s Details
2023-10-24 01:36:07 +01:00
gilesb b21f3838d4 ......
build-develop-branch / build-branch (push) Successful in 40s Details
/ prettier (pull_request) Successful in 15s Details
2023-10-24 01:33:47 +01:00
gilesb b698ad512d adding latest
build-develop-branch / build-branch (push) Successful in 38s Details
/ prettier (pull_request) Successful in 16s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-24 00:29:19 +00:00
giles 3c15598faa Merge pull request '...' (#225) from develop/tags-3 into master
build-develop-branch / new release (push) Successful in 10s Details
convert-to-xml / deploy (push) Successful in 23s Details
Reviewed-on: #225
2023-10-24 00:28:33 +00:00
gilesb 64d8cb6f40 ...
build-develop-branch / build-branch (push) Successful in 40s Details
/ prettier (pull_request) Successful in 17s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-24 01:16:11 +01:00
giles ed41a9707b Merge pull request '...' (#224) from develop/tags-3 into master
build-develop-branch / new release (push) Failing after 15s Details
convert-to-xml / deploy (push) Successful in 25s Details
Reviewed-on: #224
Reviewed-by: giles <giles.bradshaw@sigyl.com>
2023-10-24 00:03:03 +00:00
batch-bot 6f5c1153df Prettified Code!
build-develop-branch / build-branch (push) Successful in 1m3s Details
/ prettier (pull_request) Successful in 20s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-23 23:59:36 +00:00
batch-bot a6a2813005 build/tags-3 -> develop/tags-3
build-develop-branch / build-branch (push) Waiting to run Details
/ prettier (pull_request) Successful in 18s Details
2023-10-23 23:59:19 +00:00
giles ae69fb63f5 Prettified Code!
build-develop-branch / build-branch (push) Waiting to run Details
/ prettier (pull_request) Successful in 18s Details
2023-10-23 23:58:45 +00:00
gilesb eb83b0e698 ...
build-develop-branch / build-branch (push) Successful in 39s Details
/ prettier (pull_request) Successful in 17s Details
2023-10-24 00:57:42 +01:00
batch-bot b404b9f516 Prettified Code!
build-develop-branch / build-branch (push) Successful in 39s Details
/ prettier (pull_request) Successful in 16s Details
2023-10-23 23:51:00 +00:00
batch-bot 1bddb0c47c build/tags-3 -> develop/tags-3
build-develop-branch / build-branch (push) Waiting to run Details
/ prettier (pull_request) Successful in 15s Details
2023-10-23 23:50:43 +00:00
giles 6e1eaf6f2e Prettified Code!
build-develop-branch / build-branch (push) Waiting to run Details
/ prettier (pull_request) Successful in 17s Details
2023-10-23 23:50:07 +00:00
gilesb ccec5b4261 js
build-develop-branch / build-branch (push) Successful in 39s Details
/ prettier (pull_request) Successful in 20s Details
2023-10-24 00:48:51 +01:00
gilesb 96d6004f26 ...
build-develop-branch / build-branch (push) Successful in 41s Details
/ prettier (pull_request) Successful in 16s Details
2023-10-24 00:25:52 +01:00
giles c66ab8b3fa Merge pull request 'dsmmd' (#223) from develop/tags-3 into master
build-develop-branch / new release (push) Failing after 14s Details
convert-to-xml / deploy (push) Successful in 22s Details
Reviewed-on: #223
2023-10-23 23:23:41 +00:00
gilesb cc68a84653 prettier
build-develop-branch / build-branch (push) Successful in 42s Details
/ prettier (pull_request) Successful in 17s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-24 00:21:38 +01:00
giles 88b5632c3b Merge pull request 'chnagelog' (#222) from develop/tags-3 into master
build-develop-branch / new release (push) Failing after 20s Details
convert-to-xml / deploy (push) Successful in 21s Details
build-develop-branch / build-branch (push) Successful in 37s Details
Reviewed-on: #222
2023-10-23 22:47:11 +00:00
gilesb 8720e2649e dsmmd
build-develop-branch / build-branch (push) Successful in 41s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-23 23:46:28 +01:00
giles 86837dc244 Merge pull request 'chnagelog' (#221) from develop/tags-3 into master
build-develop-branch / new release (push) Failing after 11s Details
convert-to-xml / deploy (push) Successful in 23s Details
Reviewed-on: #221
2023-10-23 22:44:23 +00:00
gilesb 45a8210eea chnagelog
build-develop-branch / build-branch (push) Successful in 39s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-23 22:44:09 +00:00
giles 8bb49ece67 Merge pull request 'chnagelog' (#220) from develop/tags-3 into master
build-develop-branch / new release (push) Successful in 10s Details
convert-to-xml / deploy (push) Successful in 22s Details
Reviewed-on: #220
2023-10-23 22:39:20 +00:00
gilesb 9ab843044a chnagelog
build-develop-branch / build-branch (push) Successful in 40s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-23 23:38:23 +01:00
giles e3ac1aaa80 Merge pull request '....' (#219) from develop/tags-3 into master
build-develop-branch / new release (push) Successful in 12s Details
convert-to-xml / deploy (push) Successful in 22s Details
Reviewed-on: #219
2023-10-23 22:31:41 +00:00
gilesb 19d2937141 ....
build-develop-branch / build-branch (push) Successful in 39s Details
build-develop-branch / delete-develop (pull_request) Has been skipped Details
2023-10-23 23:30:22 +01:00
giles f47551c0fe Merge pull request 'Update README.md' (#218) from giles-patch-1 into master
build-develop-branch / new release (push) Failing after 9s Details
Reviewed-on: #218
2023-10-23 22:19:34 +00:00
giles 2439f1c76e Update README.md
build-develop-branch / if_merged (pull_request) Successful in 9s Details
build-develop-branch / delete-develop (pull_request) Successful in 14s Details
2023-10-23 22:19:20 +00:00
giles da27a27b8a Merge pull request '........' (#217) from develop/tags-3 into master
build-develop-branch / new release (push) Successful in 9s Details
convert-to-xml / deploy (push) Successful in 23s Details
Reviewed-on: #217
2023-10-23 22:12:23 +00:00
gilesb eee57de3ac ........
build-develop-branch / build-branch (push) Successful in 39s Details
build-develop-branch / if_merged (pull_request) Successful in 8s Details
build-develop-branch / delete-develop (pull_request) Successful in 13s Details
2023-10-23 23:09:43 +01:00
giles 5e8cfd9e3e Merge pull request '........' (#213) from develop/tags-1 into master
convert-to-xml / deploy (push) Failing after 19s Details
Reviewed-on: #213
2023-10-23 21:56:32 +00:00
gilesb 3eebdc98c5 ........
build-develop-branch / build-branch (push) Has been cancelled Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
build-develop-branch / delete-develop (pull_request) Successful in 15s Details
2023-10-23 21:56:15 +00:00
giles b914084c9b Merge pull request '....' (#211) from develop/tags-1 into master
Reviewed-on: #211
2023-10-23 21:31:33 +00:00
giles 8031a68ae8 Merge branch 'master' into develop/tags-1
build-develop-branch / build-branch (push) Successful in 37s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
build-develop-branch / delete-develop (pull_request) Successful in 14s Details
2023-10-23 21:31:23 +00:00
gilesb 7dcad7a562 ....
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 22:30:27 +01:00
giles ba0b5ecf4d Merge pull request '....' (#209) from develop/tags-1 into master
Reviewed-on: #209
2023-10-23 21:28:11 +00:00
giles ecd946ccef Merge branch 'master' into develop/tags-1
build-develop-branch / build-branch (push) Has been cancelled Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
build-develop-branch / delete-develop (pull_request) Successful in 14s Details
2023-10-23 21:27:56 +00:00
gilesb d92ce39982 ....
build-develop-branch / build-branch (push) Successful in 40s Details
2023-10-23 22:26:57 +01:00
giles 368390de2b Merge pull request '....' (#207) from develop/tags-1 into master
Reviewed-on: #207
2023-10-23 21:25:19 +00:00
giles a8458c87d9 Merge branch 'master' into develop/tags-1
build-develop-branch / build-branch (push) Successful in 39s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
build-develop-branch / delete-develop (pull_request) Successful in 13s Details
2023-10-23 21:24:58 +00:00
gilesb e7ca3ccd99 ....
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 22:23:21 +01:00
giles edb34ddd0d Merge pull request '....' (#206) from develop/tags-1 into master
Reviewed-on: #206
2023-10-23 21:21:42 +00:00
giles 43fdcf2c93 Merge branch 'master' into develop/tags-1
build-develop-branch / build-branch (push) Successful in 36s Details
build-develop-branch / if_merged (pull_request) Failing after 14s Details
build-develop-branch / delete-develop (pull_request) Successful in 14s Details
2023-10-23 21:20:46 +00:00
gilesb 78a828bf5a ....
build-develop-branch / build-branch (push) Has been cancelled Details
2023-10-23 22:19:18 +01:00
gilesb 3eea22ad50 ....
build-develop-branch / build-branch (push) Failing after 35s Details
2023-10-23 22:16:31 +01:00
gilesb 2fca33f8d5 ....
build-develop-branch / build-branch (push) Failing after 35s Details
2023-10-23 22:11:07 +01:00
gilesb 900de76e97 ....
build-develop-branch / build-branch (push) Failing after 35s Details
2023-10-23 22:04:33 +01:00
gilesb 33f938d90e ....
build-develop-branch / build-branch (push) Failing after 36s Details
2023-10-23 22:03:30 +01:00
gilesb ae701843b6 ....
build-develop-branch / build-branch (push) Failing after 13s Details
2023-10-23 22:02:58 +01:00
gilesb a11bb38427 ....
build-develop-branch / build-branch (push) Failing after 13s Details
2023-10-23 22:01:37 +01:00
gilesb 8dcc8b14eb ....
build-develop-branch / build-branch (push) Successful in 41s Details
2023-10-23 21:52:49 +01:00
gilesb 891dae3a05 ....
build-develop-branch / build-branch (push) Failing after 10s Details
2023-10-23 21:52:11 +01:00
gilesb ee3a056c93 .... 2023-10-23 21:50:19 +01:00
giles 15ca807891 Merge pull request '....' (#205) from develop/tags-1 into master
Reviewed-on: #205
2023-10-23 20:45:27 +00:00
giles bbccbdad8d Merge branch 'master' into develop/tags-1
build-develop-branch / build-branch (push) Has been cancelled Details
build-develop-branch / if_merged (pull_request) Successful in 18s Details
build-develop-branch / delete-develop (pull_request) Successful in 14s Details
2023-10-23 20:45:15 +00:00
gilesb 7b7ae5ee36 ....
build-develop-branch / build-branch (push) Successful in 38s Details
2023-10-23 21:44:16 +01:00
gilesb 45dc4c9991 ....
build-develop-branch / build-branch (push) Failing after 34s Details
2023-10-23 21:43:06 +01:00
gilesb 63f5fe21bf ....
build-develop-branch / build-branch (push) Failing after 11s Details
2023-10-23 21:42:01 +01:00
gilesb d70870d87c ....
build-develop-branch / build-branch (push) Failing after 11s Details
2023-10-23 21:35:23 +01:00
gilesb 5516f743ca ....
build-develop-branch / build-branch (push) Failing after 12s Details
2023-10-23 21:33:27 +01:00
gilesb 0622450300 ....
build-develop-branch / build-branch (push) Failing after 11s Details
2023-10-23 21:31:02 +01:00
gilesb 8cc2649dfd ....
build-develop-branch / build-branch (push) Failing after 11s Details
2023-10-23 21:30:04 +01:00
gilesb 2cb170aa34 ....
build-develop-branch / build-branch (push) Failing after 10s Details
2023-10-23 21:28:00 +01:00
gilesb 7039023e97 ....
build-develop-branch / build-branch (push) Failing after 10s Details
2023-10-23 21:26:33 +01:00
gilesb 9b3495004b ....
build-develop-branch / build-branch (push) Failing after 10s Details
2023-10-23 21:25:34 +01:00
gilesb e08c5df5e7 ....
build-develop-branch / build-branch (push) Failing after 10s Details
2023-10-23 21:24:47 +01:00
gilesb fce0636a7b .....
build-develop-branch / build-branch (push) Failing after 12s Details
2023-10-23 21:13:16 +01:00
gilesb fad0348d28 ..... 2023-10-23 21:10:23 +01:00
gilesb 02e6feacfd tags teasa 2023-10-23 21:06:46 +01:00
giles 70f06c38d9 Merge pull request 'package.json' (#202) from develop/tags into master
convert-to-xml / deploy (push) Failing after 20s Details
Reviewed-on: #202
2023-10-23 19:43:19 +00:00
giles c93c4c9643 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 36s Details
build-develop-branch / if_merged (pull_request) Successful in 22s Details
build-develop-branch / delete-develop (pull_request) Successful in 12s Details
2023-10-23 19:43:08 +00:00
gilesb ce2c52cb58 package.json
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:41:13 +01:00
giles e9f141cd1a Merge pull request 'package.json' (#201) from develop/tags into master
Reviewed-on: #201
2023-10-23 19:37:20 +00:00
giles 86eb6afb2b Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Has been cancelled Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Failing after 14s Details
2023-10-23 19:37:04 +00:00
gilesb 99e06995ea package.json
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:36:17 +01:00
giles eb9b79ef61 Merge pull request 'added vesion bump' (#200) from develop/tags into master
Reviewed-on: #200
2023-10-23 19:29:49 +00:00
giles 8751cb50e5 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Has been cancelled Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Failing after 12s Details
2023-10-23 19:29:37 +00:00
gilesb 24aa5f15a5 added vesion bump
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:28:48 +01:00
giles b02706f7dd Merge pull request 'added vesion bump' (#199) from develop/tags into master
Reviewed-on: #199
2023-10-23 19:22:36 +00:00
giles f57167a0fc Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 34s Details
build-develop-branch / delete (pull_request) Successful in 15s Details
build-develop-branch / if_merged (pull_request) Failing after 12s Details
2023-10-23 19:21:14 +00:00
gilesb 8ed4494bab added vesion bump
build-develop-branch / build-branch (push) Has been cancelled Details
2023-10-23 20:20:34 +01:00
giles 9b952cfc23 Merge pull request 'added vesion bump' (#197) from develop/tags into master
Reviewed-on: #197
2023-10-23 19:18:02 +00:00
giles 1e71c022a2 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 36s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
2023-10-23 19:17:34 +00:00
gilesb fff44b0ca1 added vesion bump
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:16:49 +01:00
giles 37a2df176d Merge pull request 'added vesion bump' (#195) from develop/tags into master
Reviewed-on: #195
2023-10-23 19:14:37 +00:00
giles b3e188a153 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 37s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
2023-10-23 19:14:22 +00:00
gilesb fb67f80238 added vesion bump
build-develop-branch / build-branch (push) Successful in 40s Details
2023-10-23 20:13:37 +01:00
giles 602ac08e43 Merge pull request 'added vesion bump' (#194) from develop/tags into master
Reviewed-on: #194
Reviewed-by: giles <giles.bradshaw@sigyl.com>
2023-10-23 19:09:36 +00:00
giles 17e7f97ff8 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Failing after 32s Details
build-develop-branch / delete (pull_request) Successful in 16s Details
build-develop-branch / if_merged (pull_request) Failing after 16s Details
2023-10-23 19:09:05 +00:00
gilesb 336a4b29ea added vesion bump
build-develop-branch / build-branch (push) Successful in 38s Details
2023-10-23 20:07:40 +01:00
giles f483ee2df7 Merge pull request 'Merge pull request 'tags i hope' (#192) from develop/tags into masterReviewed-on: #192' (#193) from develop/tags into master
Reviewed-on: #193
2023-10-23 18:50:29 +00:00
gilesb e81c4e1c47 fetching tags
build-develop-branch / build-branch (push) Successful in 38s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 16s Details
2023-10-23 19:49:17 +01:00
giles 575f668269 Merge pull request 'tags i hope' (#192) from develop/tags into master
build-develop-branch / build-branch (push) Successful in 34s Details
Reviewed-on: #192
2023-10-23 18:41:27 +00:00
giles b7be7ec26a Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 35s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 13s Details
2023-10-23 18:40:40 +00:00
gilesb c5658e6cef tags i hope
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 19:38:39 +01:00
giles 1dc7dc2f6a Merge pull request 'tags i hope' (#191) from develop/tags into master
Reviewed-on: #191
2023-10-23 18:36:34 +00:00
giles 113ec74fac Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 37s Details
build-develop-branch / delete (pull_request) Successful in 13s Details
build-develop-branch / if_merged (pull_request) Successful in 14s Details
2023-10-23 18:35:39 +00:00
gilesb 9752dbcd11 tags i hope
build-develop-branch / build-branch (push) Successful in 38s Details
2023-10-23 19:34:23 +01:00
giles cdc24587c0 Merge pull request 'tags i hope' (#190) from develop/tags into master
Reviewed-on: #190
2023-10-23 18:33:51 +00:00
gilesb b121f80f3c tags i hope
build-develop-branch / build-branch (push) Successful in 37s Details
2023-10-23 19:31:54 +01:00
giles bd2be6e8f0 Merge pull request 'rebase32' (#189) from develop/rebase-32 into master
Reviewed-on: #189
2023-10-23 18:05:08 +00:00
gilesb 63ba502246 removed xml
build-develop-branch / build-branch (push) Successful in 39s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 13s Details
2023-10-23 19:03:34 +01:00
gilesb 3eedf55bca removed xml
build-develop-branch / build-branch (push) Successful in 38s Details
2023-10-23 19:00:29 +01:00
gilesb fe1d870c72 rebase32
build-develop-branch / build-branch (push) Successful in 35s Details
2023-10-23 17:51:08 +00:00
gilesb e4e5fa3bb7 rebase31 2023-10-23 17:51:08 +00:00
gilesb 2c9853613b rebase30 2023-10-23 17:51:08 +00:00
gilesb d2a5bb2f92 rebase29 2023-10-23 17:51:08 +00:00
gilesb 8933c9b265 rebase28 2023-10-23 17:51:08 +00:00
gilesb b4c50e923f rebase27 2023-10-23 17:51:08 +00:00
gilesb a3aeef2f0d rebase26 2023-10-23 17:51:08 +00:00
gilesb 31ab815716 ... 2023-10-23 17:51:08 +00:00
gilesb 858eb0ee57 ... 2023-10-23 17:51:08 +00:00
gilesb fef87a3c51 .. 2023-10-23 17:51:08 +00:00
giles 76c7be1491 Merge pull request 'Merge remote-tracking branch 'origin/build/rebase-21' into build/rebase-21' (#180) from develop/rebase-22 into master
Reviewed-on: #180
2023-10-23 17:12:24 +00:00
giles 2365957c91 build/rebase-22 -> develop/rebase-22
build-develop-branch / build-branch (push) Successful in 35s Details
build-develop-branch / delete (pull_request) Successful in 13s Details
build-develop-branch / if_merged (pull_request) Successful in 11s Details
2023-10-23 17:10:37 +00:00
batch-bot a531c1debc develop/rebase-21 -> build/rebase-21
build-develop-branch / build-branch (push) Failing after 29s Details
2023-10-23 17:05:27 +00:00
giles 8396d9a537 Merge pull request '..' (#177) from develop/rebase-15 into master
Reviewed-on: #177
2023-10-23 17:05:27 +00:00
gilesb e4e0b3317b ... 2023-10-23 17:05:27 +00:00
giles 88744c399b build/rebase-22 -> develop/rebase-22
build-develop-branch / build-branch (push) Successful in 36s Details
2023-10-23 17:02:25 +00:00
batch-bot c8d68528f5 develop/rebase-21 -> build/rebase-21 2023-10-23 17:02:25 +00:00
gilesb ca7fd56310 more theres 2023-10-23 17:02:25 +00:00
gilesb b400545cff . 2023-10-23 17:02:25 +00:00
giles 9275337194 Merge pull request '..' (#177) from develop/rebase-15 into master
Reviewed-on: #177
2023-10-23 17:02:25 +00:00
gilesb 3e5657b847 thius 2023-10-23 17:02:25 +00:00
gilesb 2606aa18d8 more theres 2023-10-23 17:02:25 +00:00
gilesb d1d90aa2ad xxtheres 2023-10-23 17:02:25 +00:00
gilesb 58812abb54 ssss 2023-10-23 17:02:25 +00:00
gilesb 7ba33a3122 ssss 2023-10-23 17:02:25 +00:00
gilesb 8504eb1655 removed junk
ml files
2023-10-23 17:02:25 +00:00
gilesb 7263669cc5 .. 2023-10-23 17:02:25 +00:00
giles 7b15293fff Merge pull request '..' (#177) from develop/rebase-15 into master
Reviewed-on: #177
2023-10-23 16:21:44 +00:00
giles 7ab90419af build/rebase-15 -> develop/rebase-15
build-develop-branch / build-branch (push) Successful in 36s Details
build-develop-branch / delete (pull_request) Successful in 15s Details
build-develop-branch / if_merged (pull_request) Failing after 22s Details
2023-10-23 16:19:08 +00:00
gilesb 57b8b1a122 .. 2023-10-23 16:19:08 +00:00
gilesb 113d41d50a . 2023-10-23 16:19:08 +00:00
gilesb 2cd7383c3d . 2023-10-23 16:19:08 +00:00
gilesb a52a41e1b2 . 2023-10-23 16:19:08 +00:00
gilesb f95795e0e5 ... 2023-10-23 16:19:08 +00:00
giles 578cfd2d8c Merge pull request '...' (#176) from develop/rebase-15 into master
Reviewed-on: #176
2023-10-23 16:14:50 +00:00
giles c9e3295029 build/rebase-15 -> develop/rebase-15
build-develop-branch / build-branch (push) Successful in 38s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 12s Details
2023-10-23 16:09:53 +00:00
giles d5fe756ffe build/rebase-15 -> develop/rebase-15
build-develop-branch / build-branch (push) Successful in 34s Details
2023-10-23 15:56:08 +00:00
giles a525783377 build/rebase-15 -> develop/rebase-15
build-develop-branch / build-branch (push) Failing after 26s Details
2023-10-23 15:23:21 +00:00
gilesb 3459cac714 ... 2023-10-23 15:23:21 +00:00
gilesb 83a57e5703 ... 2023-10-23 15:23:21 +00:00
gilesb e3f9828e49 ... 2023-10-23 15:23:21 +00:00
gilesb 3c2b2390ef ... 2023-10-23 15:23:21 +00:00
gilesb 96d97f59aa hhh 2023-10-23 15:23:21 +00:00
gilesb 7a91da8fd5 ... 2023-10-23 15:23:21 +00:00
giles 38d8984f59 Merge pull request '.....' (#171) from develop/rebase-10 into master
Reviewed-on: #171
2023-10-23 14:57:44 +00:00
giles 2097f42252 build/rebase-10 -> develop/rebase-10
build-develop-branch / build-branch (push) Successful in 36s Details
build-develop-branch / delete (pull_request) Successful in 17s Details
build-develop-branch / if_merged (pull_request) Successful in 12s Details
2023-10-23 14:55:46 +00:00
gilesb 8fe72c326a ..... 2023-10-23 14:55:46 +00:00
gilesb 96481d4792 ..... 2023-10-23 14:55:46 +00:00
gilesb c3cd89d688 ..... 2023-10-23 14:55:46 +00:00
gilesb 1dc2d3bbc4 ... 2023-10-23 14:55:46 +00:00
gilesb 99805e37fd ... 2023-10-23 14:55:46 +00:00
gilesb 6528fcac86 ... 2023-10-23 14:55:46 +00:00
gilesb f4172e552c ....... 2023-10-23 14:55:46 +00:00
gilesb 1dcebf80fa ..... 2023-10-23 14:55:46 +00:00
gilesb 569b235726 ..... 2023-10-23 14:55:46 +00:00
giles 528ff25aaf develop/rebase -> build/rebase 2023-10-23 14:55:46 +00:00
giles ad343baf01 Merge pull request '.' (#160) from develop/10007 into master
build-develop-branch / build-branch (push) Failing after 30s Details
build-develop-branch / delete (pull_request) Successful in 13s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
Reviewed-on: #160
2023-10-23 13:22:59 +00:00
gilesb 8c0f4838a9 .
build-develop-branch / build-branch (push) Successful in 34s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 13s Details
2023-10-23 14:21:34 +01:00
gilesb 23440b062a jfdjfjf
build-develop-branch / build-branch (push) Failing after 19s Details
2023-10-23 14:14:29 +01:00
giles 5a1a45746e build/10006 -> develop/10006
build-develop-branch / build-branch (push) Successful in 31s Details
build-develop-branch / delete (pull_request) Successful in 15s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
2023-10-23 13:11:04 +00:00
giles d83832def4 Merge pull request '..' (#154) from develop/1002 into master
Reviewed-on: #154
2023-10-23 11:51:55 +00:00
Continuous Integration e90ecc1c4f build/1002 -> develop/1002
build-develop-branch / build-branch (push) Successful in 28s Details
build-develop-branch / delete (pull_request) Successful in 13s Details
build-develop-branch / if_merged (pull_request) Successful in 12s Details
2023-10-23 11:50:46 +00:00
giles 0bc339c089 Merge pull request 'kdjdjdjdjdjdjd' (#150) from develop/16 into master
Reviewed-on: #150
2023-10-23 11:29:01 +00:00
giles 67cc93fbca Merge branch 'master' into develop/16
build-develop-branch / build-branch (push) Successful in 29s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 11s Details
2023-10-23 11:28:42 +00:00
Continuous Integration aa6df5a13f build/16 -> develop/16
build-develop-branch / build-branch (push) Successful in 30s Details
2023-10-23 11:27:13 +00:00
Continuous Integration a0a4d54526 build/16 -> develop/16
build-develop-branch / build-branch (push) Failing after 25s Details
2023-10-23 11:21:56 +00:00
Continuous Integration a1a90495cf build/16 -> develop/16
build-develop-branch / build-branch (push) Failing after 28s Details
2023-10-23 11:18:40 +00:00
Continuous Integration df332564de build/16 -> develop/16
build-develop-branch / build-branch (push) Failing after 27s Details
2023-10-23 11:12:14 +00:00
giles 6d9ff43810 .....
convert-to-yml / develop-branch (push) Successful in 31s Details
2023-10-23 12:11:43 +01:00
giles 2fa6e35028 lllllllll
convert-to-yml / develop-branch (push) Failing after 30s Details
2023-10-23 12:08:41 +01:00
giles 3555ddf195 lllllllll
convert-to-yml / develop-branch (push) Failing after 30s Details
2023-10-23 12:06:27 +01:00
giles 8633b3478c lllllllll
convert-to-yml / develop-branch (push) Failing after 28s Details
2023-10-23 12:04:19 +01:00
giles 874fbab8ab lllllllll
convert-to-yml / develop-branch (push) Failing after 40s Details
2023-10-23 12:01:48 +01:00
giles 2e6416ec00 kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 33s Details
2023-10-23 11:58:54 +01:00
giles 24e5a58f1e kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 33s Details
2023-10-23 11:56:43 +01:00
giles 7df84cbdcc kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 33s Details
2023-10-23 11:54:51 +01:00
giles 9758df82ab kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 31s Details
2023-10-23 11:46:32 +01:00
giles 895e213189 kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 33s Details
2023-10-23 11:44:30 +01:00
giles b290a169d3 kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 30s Details
2023-10-23 11:41:10 +01:00
giles d00031a0bf kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 30s Details
2023-10-23 11:39:08 +01:00
giles b8b545850e kdjdjdjdjdjdjd
convert-to-yml / develop-branch (push) Successful in 31s Details
2023-10-23 11:33:44 +01:00
giles 507a56a8c5 kkk
convert-to-yml / develop-branch (push) Failing after 29s Details
2023-10-23 11:31:09 +01:00
giles e07d8061cf kkk
convert-to-yml / develop-branch (push) Failing after 28s Details
2023-10-23 11:30:11 +01:00
giles d2735b1e96 kkk
convert-to-yml / develop-branch (push) Failing after 29s Details
2023-10-23 11:28:54 +01:00
giles f7ae42f833 kkk
convert-to-yml / develop-branch (push) Failing after 28s Details
2023-10-23 11:27:36 +01:00
giles 8b0bc8cfc8 kkk
convert-to-yml / develop-branch (push) Failing after 30s Details
2023-10-23 11:25:32 +01:00
giles b6941fcd87 kkk
convert-to-yml / develop-branch (push) Failing after 30s Details
2023-10-23 11:24:44 +01:00
giles 0c6fa64bc1 kkk
convert-to-yml / develop-branch (push) Failing after 27s Details
2023-10-23 11:23:37 +01:00
giles 49cf1ad852 kkk
convert-to-yml / develop-branch (push) Failing after 32s Details
2023-10-23 11:22:28 +01:00
giles c1d421ec0f kkk
convert-to-yml / develop-branch (push) Failing after 30s Details
2023-10-23 11:20:51 +01:00
giles 75bd399951 kkk
convert-to-yml / develop-branch (push) Successful in 29s Details
2023-10-23 11:16:03 +01:00
giles 4152d013ab kkk
convert-to-yml / develop-branch (push) Successful in 32s Details
2023-10-23 11:13:52 +01:00
giles ca6a8e1d1d kkk
convert-to-yml / develop-branch (push) Successful in 31s Details
2023-10-23 11:12:00 +01:00
giles 528fd071f1 ........
convert-to-yml / develop-branch (push) Successful in 31s Details
2023-10-23 11:06:43 +01:00
giles bb0c9c7a89 Merge pull request 'runna diff on build and development' (#134) from develop/hrereare into master
Reviewed-on: #134
2023-10-23 09:08:14 +00:00
15 changed files with 538 additions and 335 deletions

View File

@ -1,66 +0,0 @@
name: convert-to-yml
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'build/**'
jobs:
develop-branch:
runs-on: ubuntu-latest
steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- uses: http://sigyl.com:3000/actions/setup-node@v3
with:
node-version: '20'
- run: git fetch
- name: log
run: git log -10
- uses: http://sigyl.com:3000/actions/batch2yaml@master
with:
action: yml
path: '.'
- name: get development branch name
run: |
firstString=${{ github.ref_name }}
secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/}
- name: commit
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
- name: status
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git branch -r
- name: diff
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
if [[ $(git branch -r | grep -Fx origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -eq 0 ]]; then
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
chmod +x ./tea;
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }};
if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then
./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}"
fi
echo 'pushed new branch and created pr';
else
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
else
echo 'no changes so no push'
fi;
fi

View File

@ -0,0 +1,87 @@
name: convert-to-yml
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'build/**'
jobs:
develop-branch:
runs-on: ubuntu-latest
steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- uses: http://sigyl.com:3000/actions/setup-node@v3
with:
node-version: '20'
- run: git fetch
- env: env
run: printenv
- uses: http://sigyl.com:3000/actions/batch2yaml@master
with:
action: yml
path: '.'
- name: get development branch name
run: |
firstString=${{ github.ref_name }}
secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/}
- name: config
run: |
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.event.pusher.email }}"
- name: commit
run: |
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
- name: status
run: |
git branch -r
echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c)
- name: push
run: |
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
ls
git log -5
git status
git rebase -Xtheirs origin/master
ls
git log -4
git status
echo no development branch so pushing
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
chmod +x ./tea;
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }};
if [[ $(./tea pr ls -f=base,head -o=csv | grep grep "\"master\",\"${{ env.DEVELOPMENT_BRANCH }}\"" | head -c1 | wc -c) -eq 0 ]]; then
./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="
development pull request
this PR is instigated by and will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})
" -t="WIP: ${{ github.event.head_commit.message }}"
fi
echo 'pushed new branch and created pr';
else
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
#git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned fetch origin #--depth=1
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
mv ../cloned/.git ..
rm -rf ../cloned
cp -r . ../cloned
rm -rf ../cloned/.git
mv ../.git ../cloned
mv .git/config ../cloned/.git
rm -r ./*
rm -r .git
mv ../cloned/* .
mv ../cloned/.git .
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
else
echo 'no changes so no push'
fi;
fi

View File

@ -0,0 +1,13 @@
name: Changelog
on:
release:
types:
- created
jobs:
changelog:
runs-on: ubuntu-20.04
steps:
- name: "✏️ Generate release changelog"
uses: heinrichreimer/action-github-changelog-generator@v2.3
with:
token: ${{ secrets.BOT_TOKEN }}

View File

@ -1,59 +0,0 @@
name: build-develop-branch
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'develop/**'
jobs:
build-branch:
runs-on: ubuntu-latest
steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- uses: http://sigyl.com:3000/actions/setup-node@v3
with:
node-version: '20'
- uses: http://sigyl.com:3000/actions/batch2yaml@master
with:
action: xml
path: '.'
- name: get PR number
run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
chmod +x ./tea
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
./tea pr ls -f=base,head,index
echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1)
rm ./tea
echo PR: $PR
- run: git fetch
- name: get build branch name
run: |
firstString=${{ github.ref_name }}
secondString="build"
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
- name: GIT commit and push all changed files
env:
CI_COMMIT_MESSAGE: Development branch built to xml.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
git checkout -b ${{ env.BUILD_BRANCH }}
git merge --squash ${{ github.ref_name }}
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
git push -f origin HEAD:${{ env.BUILD_BRANCH }}
else
echo 'no changes so no push'
fi;
- name: make pull request comment
run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
chmod +x ./tea
./tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})"

View File

@ -0,0 +1,89 @@
name: build-develop-branch
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'develop/**'
jobs:
build-branch:
runs-on: ubuntu-latest
steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- env: env
run: printenv
- name: get tea
run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output ../tea
chmod +x ../tea
../tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
- uses: http://sigyl.com:3000/actions/setup-node@v3
with:
node-version: '20'
- uses: http://sigyl.com:3000/actions/batch2yaml@master
with:
action: xml
path: '.'
- run: git fetch
- name: config
run: |
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.event.pusher.email }}"
- name: get build branch name
run: |
firstString=${{ github.ref_name }}
secondString="build"
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
- name: status
run: |
ls
- name: push
run: |
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
if [[ $(git branch -r | grep -Fx " origin/${{ env.BUILD_BRANCH }}" | wc -c) -eq 0 ]]; then
git push origin HEAD:${{ env.BUILD_BRANCH }};
else
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
#git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned fetch origin #--depth=1
git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
mv ../cloned/.git ..
rm -rf ../cloned
cp -r . ../cloned
rm -rf ../cloned/.git
mv ../.git ../cloned
mv .git/config ../cloned/.git
rm -r ./*
rm -r .git
mv ../cloned/* .
mv ../cloned/.git .
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
git push origin HEAD:${{ env.BUILD_BRANCH }}
else
echo 'no changes so no push'
fi;
fi;
- name: make PR
run: |
../tea pr ls -f=base,head -o=csv
if [[ $(../tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then
../tea pr c --base=master --head=${{ github.ref_name }} --description="
development pull request
this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})
" -t="WIP: ${{ github.event.head_commit.message }}"
fi
- name: get PR number
run: |
pr=$(../tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1)
export PR="${pr//[\"\'\`]/}"
echo ::set-env name=PR::$PR
- name: make pull request comment
run: |
../tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})"

View File

@ -4,11 +4,13 @@ on:
pull_request:
types:
- closed
- deleted
branches:
- 'master'
- master
jobs:
delete:
delete-develop:
if: ${{ ! startsWith(github.head_ref, 'develop/') }}
runs-on: ubuntu-latest
steps:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
@ -28,19 +30,6 @@ jobs:
firstString=${{ github.head_ref }}
secondString="build"
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s
if_merged:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
- name: delete develop branch
id: delete_develop_branch
run: git push origin --delete ${{ github.head_ref }}
continue-on-error: true
- uses: mainmatter/continue-on-error-comment@v1
with:
repo-token: ${{ secrets.BOT_TOKEN }}
outcome: ${{ steps.delete_develop_branch.outcome }}
test-id: Error code ${{ matrix.code }}
- name: delete build branch
run: git push origin --delete ${{ env.BUILD_BRANCH }}

View File

@ -1,81 +0,0 @@
name: convert-to-yml
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'format/**'
jobs:
develop-branch:
runs-on: ubuntu-latest
steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- uses: http://sigyl.com:3000/actions/setup-node@v3
with:
node-version: '20'
- uses: http://sigyl.com:3000/actions/batch2yaml@master
with:
action: yml
path: '.'
- name: get development branch name
run: |
firstString=${{ github.ref_name }}
secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/}
git status
- name: clone
run: |
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned fetch origin #--depth=1
git -C ../cloned branch -r
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
mv ../cloned/.git ..
rm -rf ../cloned
cp -r . ../cloned
rm -rf ../cloned/.git
mv ../.git ../cloned
mv .git/config ../cloned/.git
rm -r ./*
rm -r .git
mv ../cloned/* .
mv ../cloned/.git .
- name: GIT commit and push all changed files
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git add -A
git status
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
#- name: push development
# env:
# CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts
# CI_COMMIT_AUTHOR: Continuous Integration
# run: |
# git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
# git config --global user.email "username@users.noreply.github.com"
# git fetch --depth=1
# git add -A
# git commit -m "${{ env.CI_COMMIT_MESSAGE }}
#
# converted from batch"
# git merge origin/master --strategy-option=ours --allow-unrelated
# git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
- name: make pull request
#git fetch
# git merge origin/master --allow-unrelated-histories --strategy-option=ours
# git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
chmod +x ./tea
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then
./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}"
fi
rm ./tea

View File

@ -0,0 +1,24 @@
name: master-pushed
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'master'
jobs:
new release:
runs-on: ubuntu-latest
steps:
- name: get tea
run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output ../tea
chmod +x ../tea
../tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
- name: bump release
run: |
export version=$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1 | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g')
../tea r c --note="this isrelease ${version}" --tag=${version} --title=${version} --target=${{ github.sha }}
echo ::set-env name=VERSION::$version

View File

@ -0,0 +1,23 @@
on:
pull_request:
branches: [master]
jobs:
prettier:
runs-on: ubuntu-latest
steps:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}
# This is important to fetch the changes to the previous commit
fetch-depth: 0
- name: Prettify code
uses: creyD/prettier_action@v4.3
with:
# This part is also where you can pass other options, for example:
prettier_options: --write **/*.{js,md}
only_changed: true

View File

@ -31,4 +31,4 @@ jobs:
git config --global user.email "username@users.noreply.github.com"
git add -A
git commit -a -m "${{ github.ref_name }} -> refs/heads/deployed/${{ github.ref_name }} "
git push origin HEAD:refs/heads/deployed/${{ github.ref_name }}
git push -f origin HEAD:refs/heads/deployed/${{ github.ref_name }}

28
.gitea/workflows/tea.yml Normal file
View File

@ -0,0 +1,28 @@
name: tea
on:
workflow_call:
secrets:
token:
required: true
jobs:
tea:
runs-on: ubuntu-latest
steps:
- name: get tea
run: |
echo tea please!
#curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output ../tea
#chmod +x ../tea
#../tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.token }}
#echo thank you!
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- name: ls
run: ls

204
README.md
View File

@ -1,104 +1,100 @@
# batch-example
This repository will store and allow versioning and approval of a batch configuration.
This repository **only** contains exported configuration. It does not contain any binary files (eg equipment-model.cfg nor system state or log files). These are excluded using the **.gitignore** file.
## change process
tea is here (i had to change docker file to just be based on node:latest)
https://gitea.com/gitea/tea/src/branch/main/docs/CLI.md
On ?tag ? push to master
clone master
branch deployed
yml -> xml
push deployed
pull to production PC and import.
pull to development, import, modify, export
push from development to format branch
on format-branch pull, xml -> yml, push to product-development and PR
### FTBatch development pc on development branch
```sh
?git branch -D format-branch
git checkout format-branch
git merge deployed
```
make changes and export files
commit and push back to server
```sh
git add -A
git commit
git push origin format-branch
```
### format-bot pc
```sh
git branch -D format-branch
git fetch origin
git checkout -b format-branch
git checkout master
git pull
git branch -D product-development
git checkout -b product-development
git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
```
run the formatter
```sh
git add -A
git commit
git push origin product-development
git push origin --delete format-branch
```
create a pull request
```sh
git fetch --tags
gotea pr c --base=master --head=product-development --repo another-user/batch-example --title="WIP: this is a PR! it rocks!"
```
closing a pull request (not used)
```sh
gotea pr close --repo another-user/batch-example 11
```
build
```sh
git checkout master
git pull
git checkout deployed
git merge master
```
make xml files
```sh
git add -A
git commit
git push origin deployed
```
# batch-example
This repository will store and allow versioning and approval of a batch configuration.
This repository **only** contains exported configuration. It does not contain any binary files (eg equipment-model.cfg nor system state or log files). These are excluded using the **.gitignore** file.
## change process
tea is here (i had to change docker file to just be based on node:latest)
https://gitea.com/gitea/tea/src/branch/main/docs/CLI.md
On ?tag ? push to master
clone master
branch deployed
yml -> xml
push deployed
pull to production PC and import
pull to development, import, modify, export
push from development to format branch
on format-branch pull, xml -> yml, push to product-development and PR
### FTBatch development pc on development branch
```sh
?git branch -D format-branch
git checkout format-branch
git merge deployed
```
make changes and export files
commit and push back to server
```sh
git add -A
git commit
git push origin format-branch
```
### format-bot pc
```sh
git branch -D format-branch
git fetch origin
git checkout -b format-branch
git checkout master
git pull
git branch -D product-development
git checkout -b product-development
git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
```
run the formatter
```sh
git add -A
git commit
git push origin product-development
git push origin --delete format-branch
```
create a pull request
```sh
git fetch --tags
gotea pr c --base=master --head=product-development --repo another-user/batch-example --title="WIP: this is a PR! it rocks!"
```
closing a pull request (not used)
```sh
gotea pr close --repo another-user/batch-example 11
```
build
```sh
git checkout master
git pull
git checkout deployed
git merge master
```
make xml files
```sh
git add -A
git commit
git push origin deployed
```

View File

@ -12,7 +12,7 @@
- Type: '1'
- Member:
- Name: YES
- Ordinal: '1'
- Ordinal: '19'
- Member:
- Name: NO
- Ordinal: '0'
@ -21,7 +21,7 @@
- Type: '0'
- EnumerationSet:
- UniqueName: $TIMER_TYPE
- Type: '1'
- Type: '13'
- Member:
- Name: COUNT_DOWN
- Ordinal: '0'
@ -124,7 +124,7 @@
- Name: Begin Approvals
- Id: '-1'
- StepOrder: '1'
- Required: '1'
- Required: 1q
- ApproveSignatureTemplateName: null
- RevertSignatureTemplateName: null
- Description: Used to formally begin the approval process.
@ -135,9 +135,9 @@
- Required: '0'
- ApproveSignatureTemplateName: null
- RevertSignatureTemplateName: null
- Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsxsxsdit is ready for v vredcdview.s...gfhhh....
- Description: Confirmation by the author of the recipe tgabghatcdcscsvdsvdsvsxsxsdit is ready for h v vredcdview.s...gfhhh....
- RecipeApprovalStep:
- Name: Review Recipe
- Name: Reviqedcdw Recipe
- Id: '-3'
- StepOrder: '3'
- Required: '0'

View File

@ -17,7 +17,7 @@
- Name: NO
- Ordinal: '0'
- EnumerationSet:
- UniqueName: PHASE_FAILURES
- UniqueName: PHASE_FAILURESzx
- Type: '0'
- EnumerationSet:
- UniqueName: $TIMER_TYPE

160
try.js Normal file
View File

@ -0,0 +1,160 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import * as React from "react";
import ReactVersion from "shared/ReactVersion";
import { LegacyRoot } from "react-reconciler/src/ReactRootTags";
import {
createContainer,
updateContainer,
injectIntoDevTools,
} from "react-reconciler/src/ReactFiberReconciler";
import Transform from "art/core/transform";
import Mode from "art/modes/current";
import FastNoSideEffects from "art/modes/fast-noSideEffects";
import { TYPES, childrenAsString } from "./ReactARTInternals";
Mode.setCurrent(
// Change to 'art/modes/dom' for easier debugging via SVG
FastNoSideEffects,
);
/** Declarative fill-type objects; API design not finalized */
const slice = Array.prototype.slice;
class LinearGradient {
constructor(stops, x1, y1, x2, y2) {
this._args = slice.call(arguments);
}
applyFill(node) {
node.fillLinear.apply(node, this._args);
}
}
class RadialGradient {
constructor(stops, fx, fy, rx, ry, cx, cy) {
this._args = slice.call(arguments);
}
applyFill(node) {
node.fillRadial.apply(node, this._args);
}
}
class Pattern {
constructor(url, width, height, left, top) {
this._args = slice.call(arguments);
}
applyFill(node) {
node.fillImage.apply(node, this._args);
}
}
/** React Components */
class Surface extends React.Component {
componentDidMount() {
const { height, width } = this.props;
this._surface = Mode.Surface(+width, +height, this._tagRef);
this._mountNode = createContainer(
this._surface,
LegacyRoot,
null,
false,
false,
"",
);
updateContainer(this.props.children, this._mountNode, this);
}
componentDidUpdate(prevProps, prevState) {
const props = this.props;
if (props.height !== prevProps.height || props.width !== prevProps.width) {
this._surface.resize(+props.width, +props.height);
}
updateContainer(this.props.children, this._mountNode, this);
if (this._surface.render) {
this._surface.render();
}
}
componentWillUnmount() {
updateContainer(null, this._mountNode, this);
}
render() {
// This is going to be a placeholder because we don't know what it will
// actually resolve to because ART may render canvas, vml or svg tags here.
// We only allow a subset of properties since others might conflict with
// ART's properties.
const props = this.props;
// TODO: ART's Canvas Mode overrides surface title and cursor
const Tag = Mode.Surface.tagName;
return (
<Tag
ref={(ref) => (this._tagRef = ref)}
accessKey={props.accessKey}
className={props.className}
draggable={props.draggable}
role={props.role}
style={props.style}
tabIndex={props.tabIndex}
title={props.title}
/>
);
}
}
class Text extends React.Component {
constructor(props) {
super(props);
// We allow reading these props. Ideally we could expose the Text node as
// ref directly.
["height", "width", "x", "y"].forEach((key) => {
Object.defineProperty(this, key, {
get: function () {
return this._text ? this._text[key] : undefined;
},
});
});
}
render() {
// This means you can't have children that render into strings...
const T = TYPES.TEXT;
return (
<T {...this.props} ref={(t) => (this._text = t)}>
{childrenAsString(this.props.children)}
</T>
);
}
}
injectIntoDevTools({
findFiberByHostInstance: () => null,
bundleType: __DEV__ ? 1 : 0,
version: ReactVersion,
rendererPackageName: "react-art",
});
/** API */
export const ClippingRectangle = TYPES.CLIPPING_RECTANGLE;
export const Group = TYPES.GROUP;
export const Shape = TYPES.SHAPE;
export const Path = Mode.Path;
export { LinearGradient, Pattern, RadialGradient, Surface, Text, Transform };