Skip to content

Conversation

@akeeste
Copy link
Contributor

@akeeste akeeste commented Feb 28, 2024

This PR updates the CI workflows for the Applications repo and any documentation references within it to reference the main branches WEC-Sim/WEC-Sim#1215

@akeeste akeeste requested a review from H0R5E March 5, 2024 16:45
# WEC-Sim_Applications

[![master build status](https://github.com/WEC-Sim/WEC-Sim_Applications/actions/workflows/run-tests-master.yml/badge.svg)](https://github.com/WEC-Sim/WEC-Sim_Applications/actions/workflows/run-tests-master.yml)
[![main build status](https://github.com/WEC-Sim/WEC-Sim_Applications/actions/workflows/run-tests-main.yml/badge.svg)](https://github.com/WEC-Sim/WEC-Sim_Applications/actions/workflows/run-tests-main.yml)
Copy link
Contributor

@H0R5E H0R5E Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akeeste, you either need to rename the workflow file to run-tests-main.yml or leave the links to the files unaltered.

@H0R5E
Copy link
Contributor

H0R5E commented Mar 5, 2024

I assume you're going to push this to main, yes?

@akeeste
Copy link
Contributor Author

akeeste commented Mar 5, 2024

Yes before merging I'll make the main branch and make this PR go into main

@H0R5E
Copy link
Contributor

H0R5E commented Mar 13, 2024

@akeeste can you resubmit this PR against the new main branch?

@akeeste akeeste changed the base branch from master to main March 13, 2024 13:59
@akeeste
Copy link
Contributor Author

akeeste commented Mar 13, 2024

Thanks @H0R5E! I reran the tests here and the documentation tests on WEC-Sim/WEC-Sim#1235. Everything seems to be passing now.

The last thing before merging #59 and WEC-Sim/WEC-Sim#1235, is to update the default branch on the Applications repo to main. If you can rename master directly to main, it looks like we'll have the added benefit of having API or web requests to master automatically redirect to the main branch https://github.com/github/renaming?tab=readme-ov-file#renaming-existing-branches

@akeeste
Copy link
Contributor Author

akeeste commented Mar 13, 2024

I'm not sure how renaming 'master' to 'main' will go if the 'main' branch already exists. If we need to take a couple extra steps to get the API / web requests automatically redirecting, it's worth it; e.g.

  1. update this PR back into master so that it is not closed
  2. delete the current main branch
  3. then rename master to main with auto redirecting

@H0R5E H0R5E changed the base branch from main_test to master March 13, 2024 18:01
@H0R5E
Copy link
Contributor

H0R5E commented Mar 13, 2024

@akeeste, I'm on it.

@H0R5E
Copy link
Contributor

H0R5E commented Mar 13, 2024

@akeeste, I found another reference two references to the master branch in the Wave_Markers folder. Can you fix this one, also?

@akeeste
Copy link
Contributor Author

akeeste commented Mar 13, 2024

@akeeste, I found another reference two references to the master branch in the Wave_Markers folder. Can you fix this one, also?

Good catch, done! I did one more search across all Applications repo files but did not find any other references to master. let me know if you catch anything else.

@akeeste
Copy link
Contributor Author

akeeste commented Mar 13, 2024

I also just confirmed that this repo's Mooring test does not checkout a specific master or main branch from the WEC-Sim/MoorDyn repo. There's only one branch and the default is always used for the test, so that repo should not affect this PR

@H0R5E
Copy link
Contributor

H0R5E commented Mar 15, 2024

@akeeste, I'm going to merge this now. Thanks for sorting this out and the tip about renaming the branches.

@H0R5E H0R5E merged commit 8580aa7 into WEC-Sim:main Mar 15, 2024
@akeeste akeeste deleted the update_CI_to_main branch March 20, 2024 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants