Rebase develop onto main on release #16

Merged

JMR-dev merged 6 commits from gh-release-merge-develop-into-main-on-release into develop 2025-10-02 00:23:31 +00:00

Conversation 4 Commits 6 Files Changed 2

+143 -77

6 Commits

Author	SHA1	Message	Date
JMR-dev	b124486967	made updates to merge --ff-only instead of rebase on main for safety	2025-10-01 19:15:45 -05:00
JMR-dev	75992f873b	update which branches trigger status checks	2025-10-01 19:03:18 -05:00
JMR-dev	edbb7bc74f	added permissions to rhel job	2025-10-01 19:03:18 -05:00
JMR-dev	0ce01a0419	updated workflow step	2025-10-01 19:03:18 -05:00
JMR-dev	8777085e38	add dockerfile for custom rhel image	2025-10-01 19:03:18 -05:00
JMR-dev	59134cb94c	updated release workflow to merge develop into main when a release is invoked	2025-10-01 16:13:44 -05:00