Integrate Custom Random Matrix Generation and Merge Ubuntu and Windows Workflows #1776
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
…ndows workflows - Added a new CI workflow using vlsi/github-actions-random-matrix to generate a dynamic matrix for testing on both Ubuntu and Windows with JDK 8 and JDK 11. - Merged existing build steps for Ubuntu and Windows into a single workflow file (ci.yml). - Moved common steps, such as caching the Android jar and compiling, into a separate setup job to improve CI efficiency. - Updated README.md to reflect the new combined CI workflow badge. - Improved test coverage and reduced CI resource usage by leveraging the matrix strategy.
- Added a new patch file
BereKanters
changed the title
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1776 +/- ##
=========================================
Coverage 92.73% 92.73%
Complexity 116 116
=========================================
Files 442 442
Lines 4941 4941
Branches 234 234
=========================================
Hits 4582 4582
Misses 312 312
Partials 47 47
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
robstoll
requested changes
Jun 13, 2024
There was a problem hiding this comment.
Take a look at https://github.com/vlsi/github-actions-random-matrix again
…d Windows workflows updated based on feedback - Added custom matrix generation scripts (`matrix_builder.js` and `matrix.js`) to dynamically generate the matrix for CI jobs. - Configured the GitHub Actions workflow (`ci.yml`) to use the custom matrix generator. - Renamed the `setup` job to `dexer` and included the step to check if Atrium's -jvm.jar can be dexed.
robstoll
requested changes
Jun 14, 2024
robstoll
reviewed
Jun 14, 2024
robstoll
requested changes
Jun 14, 2024
robstoll
reviewed
Jun 14, 2024
robstoll
reviewed
Jun 14, 2024
…Windows workflows based on given feedback - Updated the `forwardCompatibility` job to run in parallel with `dexer` by removing the unnecessary dependency. - Added `fetch-depth: 1` to all checkout steps for faster execution. - Removed unnecessary Node.js setup step since Node.js is pre-installed on the runner. - Updated the README file to reflect the new combined CI workflow badge. - Removed patch file
robstoll
reviewed
Jun 15, 2024
robstoll
reviewed
Jun 15, 2024
- Updated distribution and java-version back to 'adopt' and '17'
robstoll
reviewed
Jun 16, 2024
There was a problem hiding this comment.
You have merge conflicts which means you need to rebase on main of Atrium, i.e. not on your local main -- add atrium as git remote add upstream https://github.com/robstoll/atrium and then git rebase upstream/main and resolve the conflicts. Let me know in case you need help with it
| @@ -86,7 +84,7 @@ jobs: | |||
| run: ATRIUM_ANDROID_JAR="$PWD/android-jar-cache/android.jar" ./gradlew checkDexer | |||
|
|
|||
| forwardCompatibility: | |||
| needs: [] #Not sure if it should be left empty or if it should contain generate-matrix | |||
| needs: [] | |||
There was a problem hiding this comment.
You could also remove the line entirely
Copied samples from api-fluent: - CharSequenceToContainCheckerSamples.kt - CharSequenceToContainCreatorSamples.kt - CharSequenceToContainSearchBehaviourSamples.kt - Transformed examples to the infix style. - Linked corresponding functions in the KDOC via @sample. - Updated regex patterns in CharSequenceToContainCreatorSamples to more complex patterns to differentiate them from simple value checks. - Revised tests for `value`, `values`, `regex`, and `elementsOf` to use more complex regex patterns like "A(BC|C/DC)". - Added @sample comments to ensure consistency with existing documentation and examples.
…ndows workflows - Added a new CI workflow using vlsi/github-actions-random-matrix to generate a dynamic matrix for testing on both Ubuntu and Windows with JDK 8 and JDK 11. - Merged existing build steps for Ubuntu and Windows into a single workflow file (ci.yml). - Moved common steps, such as caching the Android jar and compiling, into a separate setup job to improve CI efficiency. - Updated README.md to reflect the new combined CI workflow badge. - Improved test coverage and reduced CI resource usage by leveraging the matrix strategy.
- Added a new patch file
…d Windows workflows updated based on feedback - Added custom matrix generation scripts (`matrix_builder.js` and `matrix.js`) to dynamically generate the matrix for CI jobs. - Configured the GitHub Actions workflow (`ci.yml`) to use the custom matrix generator. - Renamed the `setup` job to `dexer` and included the step to check if Atrium's -jvm.jar can be dexed.
…er` by removing the unnecessary dependency. - Added `fetch-depth: 1` to all checkout steps for faster execution. - Removed unnecessary Node.js setup step since Node.js is pre-installed on the runner. - Updated the README file to reflect the new combined CI workflow badge. - Removed patch file
- Updated distribution and java-version back to 'adopt' and '17'
- Removed Needs in forwardCompatibility - Should have resolved conflicts and rebased on main of Atrium
…eature/random-matrix-ci # Conflicts: # .github/workflows/quality-assurance.yml
|
I have no clue what just happend, I did git rebase upstream/main (I already had the upstream set) afterwords asked me to resolve conflicts where I removed the build_windows file by using: 'git rm .github/workflows/build-windows.yml ' then added |
- Removed Needs in forwardCompatibility - Reset to earliet commit.
…eature/random-matrix-ci
|
Alright I went back to an older commit [28ff511] changed code on feedback and it should now be fixed |
- Updated `matrix_builder.js` to ensure the `namePattern` is correctly set and used to generate meaningful names for the matrix rows. - Configured `matrix.js` to set the `namePattern` for generating the matrix rows, ensuring the `name` field is populated.
robstoll
reviewed
Jun 16, 2024
- Updated `matrix.js` Axis contains: 'corretto', 'liberica', 'microsoft','temurin','zulu',
- Updated `matrix.js` Axis contains: 'corretto', 'liberica', 'microsoft','temurin','zulu',
robstoll
previously approved these changes
Jun 16, 2024
BereKanters
dismissed
robstoll’s stale review
The merge-base changed after approval.
|
@BereKanters thanks for your second contribution. I missed that you changed the target branch just before I merged. We'll figure out if everything was as intended at a screen bigger than my mobile phone. |
BereKanters
added a commit
to BereKanters/atrium
that referenced
this pull request
Jun 16, 2024
…s Workflows (robstoll#1776) * ###feature/Integrate random matrix generation and merge Ubuntu and Windows workflows - Added a new CI workflow using vlsi/github-actions-random-matrix to generate a dynamic matrix for testing on both Ubuntu and Windows with JDK 11 and JDK 17 - Merged existing build steps for Ubuntu and Windows into a single workflow file.
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.
This PR addresses issue #1460 by integrating a custom random matrix generation script and merging the Ubuntu and Windows workflows into a single CI workflow. This change aims to improve test coverage and CI resource efficiency.
I confirm that I have read the Contributor Agreements v1.0, agree to be bound on them and confirm that my contribution is compliant.