Commit Graph
36 Commits
Author SHA1 Message Date
Jordan Dominion c160c599cd Switch to actions/create-github-app-token
Fix SS13 target installation
2024-08-28 07:07:14 -04:00
Jordan Dominion 9857cc7069 Remove unused envvars 2024-08-25 11:22:29 -04:00
Jordan DominionandGitHub 62ee5fac78 Merge pull request #1895 from tgstation/dependabot/github_actions/master/robotology/gh-action-nightly-merge-1.5.2
Bump robotology/gh-action-nightly-merge from 1.5.0 to 1.5.2
2024-08-25 00:22:46 -04:00
Jordan Dominion 9f89cbd382 Fix fucking master merge again 2024-08-22 20:37:26 -04:00
Jordan Dominion 5a8287bacd Fix stray usages of ReleaseNotes app token generation 2024-08-22 17:15:48 -04:00
dependabot[bot]andGitHub a2336d78e8 Bump robotology/gh-action-nightly-merge from 1.5.0 to 1.5.2
Bumps [robotology/gh-action-nightly-merge](https://github.com/robotology/gh-action-nightly-merge) from 1.5.0 to 1.5.2.
- [Release notes](https://github.com/robotology/gh-action-nightly-merge/releases)
- [Commits](https://github.com/robotology/gh-action-nightly-merge/compare/14b4a4cf358f7479aa708bee05cf8a794d6a2516...81570ba03dd370f582bd3f52d47672d29191829f)

---
updated-dependencies:
- dependency-name: robotology/gh-action-nightly-merge
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-22 07:12:21 +00:00
Jordan Dominion 726e5fb2ee Fully switch to the GitHubApp token action
- Fix --ensure-release not having the token set.
- Remove `--token-output-file` command.
- Remove upload code coverage dependency on releasenotes.
2024-08-21 03:59:22 -04:00
Jordan Dominion 6753915ef6 Format a bunch of documents 2024-08-21 03:14:55 -04:00
Jordan Dominion 47cf7123cf Remove all unnecessary explicit restores 2024-08-16 22:58:15 -04:00
Jordan Dominion c0c286ab56 Add missing env var to master merge 2024-08-11 07:50:08 -04:00
Jordan Dominion c6616df378 Add missing dotnet versions to master merge 2024-08-09 07:28:48 -04:00
Jordan Dominion 492bcbe919 Fix master merge bot committer e-mail 2024-08-04 22:33:09 -04:00
Jordan Dominion 5cf8f3b4e1 Add missing setup-dotnet step to master merge workflow 2024-08-04 11:14:46 -04:00
Jordan Dominion 61bbd134d1 Fix master merge token generation 2024-07-21 22:06:50 -04:00
Jordan Dominion c165fc7c1a Changelogs and stable merge now generated by app 2024-07-16 21:35:03 -04:00
Jordan Dominion 37460cca63 Cleanup how app token is generated 2024-07-16 21:35:02 -04:00
Jordan Dominion 57aa34ee68 Stable merge using GitHub App 2024-07-15 17:34:01 -04:00
Jordan Dominion 3133a60033 Run master merge on master pushes 2024-07-13 20:55:12 -04:00
Jordan Dominion 711e826a48 The reason why the push with my token fails makes no sense 2024-07-13 20:50:53 -04:00
Jordan Dominion 2ca494e906 Switch back to basic pushes from me 2024-07-13 19:40:53 -04:00
Jordan Dominion a6510fb49d Set release notes token 2024-07-13 13:06:54 -04:00
Jordan Dominion b6967cfab6 Fixing up master merge 2024-07-13 13:03:26 -04:00
Jordan Dominion a2e4582ea0 Actually allow this action to run as workflow_dispatch 2024-07-13 12:55:44 -04:00
Jordan Dominion ef28f78c57 Attempt at getting master merging working again 2024-07-13 12:53:52 -04:00
Jordan Dominion ea2c5dc058 Only trigger master merge on successful CI 2024-03-25 19:57:14 -04:00
Jordan Dominion 6745c2f792 Make master merge depend on CI Pipeline
This should fix the auto-integration issues
2024-03-25 17:04:21 -04:00
Jordan Dominion c4f194a61e Update Master Merge workflow 2024-03-03 16:29:10 -05:00
Jordan Dominion 41a70a7bc6 Update to actions/checkout@v4 for master merge workflow 2024-01-29 17:48:30 -05:00
Jordan Dominion e4b3699bfc Explicitly tag actions that accept secrets 2023-06-20 18:47:14 -04:00
Dominion 0813b225e6 Minor corrections to Master Merge workflow 2023-04-29 09:45:08 -04:00
Jordan Brown 4d6b6f4bf8 Try using checkout v1 for stable merge 2022-09-25 10:18:52 -04:00
Jordan Brown dd8cb3e216 Update tags for various CI actions 2022-09-15 20:29:13 -04:00
Jordan DominionandGitHub 40ce3e15a9 Update gh-action-nightly-merge to latest 2022-07-18 20:29:09 -04:00
Jordan Brown db13993dc8 This action is broken and thinks we're a fork 2022-02-07 13:05:57 -05:00
Jordan Brown a14f52f872 Update master merge yml names 2020-06-25 17:27:54 -04:00
Jordan Brown 5c055dc727 Add a workflow to merge master to dev 2020-03-28 12:24:55 -04:00