Sync develop and main #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mathomp4
approved these changes
May 6, 2024
|
Approved |
mathomp4
added
the
0 diff
ashiklom
added a commit
to GEOS-ESM/swell
that referenced
this pull request
Oct 1, 2024
Since GEOS-ESM/GEOS_mksi#2 was merged, GEOS_mksi main and develop are now in sync. This was causing the GEOS_mksi test to fail. This changes the test to point to a known (very old!) version of GEOS_mksi that will cause an error, so the test actually passes.
ashiklom
added a commit
to GEOS-ESM/swell
that referenced
this pull request
Oct 1, 2024
Since GEOS-ESM/GEOS_mksi#2 was merged, GEOS_mksi main and develop are now in sync. This was causing the GEOS_mksi test to fail. This changes the test to point to a known (very old!) version of GEOS_mksi that will cause an error, so the test actually passes.
Dooruk
pushed a commit
to GEOS-ESM/swell
that referenced
this pull request
Oct 1, 2024
* Remove hardcoded /tmp from code_tests See #432 * Fix GEOS_mksi test Since GEOS-ESM/GEOS_mksi#2 was merged, GEOS_mksi main and develop are now in sync. This was causing the GEOS_mksi test to fail. This changes the test to point to a known (very old!) version of GEOS_mksi that will cause an error, so the test actually passes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Matt: This now sync's main to develop - with this both are identical. Turns out what was in develop was ahead of what was in main - so the update here is to main.