chore(deps): aggregate core dependabot updates #930
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ concurrency: | |
| jobs: | ||
| build: | ||
| if: github.event.pull_request.draft == false | ||
| uses: huggingface/doc-builder/.github/workflows/build_pr_documentation.yml@7e6bd45ee271b96e75484eeafea1b3e6139cd0c7 # main | ||
|
There was a problem hiding this comment. Same conflict as |
||
| with: | ||
| commit_sha: ${{ github.event.pull_request.head.sha }} | ||
| pr_number: ${{ github.event.number }} | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ on: | |
|
|
||
| jobs: | ||
| build: | ||
| uses: huggingface/doc-builder/.github/workflows/upload_pr_documentation.yml@7e6bd45ee271b96e75484eeafea1b3e6139cd0c7 # main | ||
|
There was a problem hiding this comment. This one merges cleanly — #923 didn't touch |
||
| with: | ||
| package_name: openenv | ||
| secrets: | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge conflict with
main. #923 ("Make doc builds faster", merged ~39s after this PR opened) already advanced this pin toe60a538, the direct parent of7e6bd45. Since this PR re-pins the same line from the oldbcff59f, a 3-way merge conflicts here —git merge-tree origin/main <head>confirmsCONFLICT (content). (GitHub's currentmergeableflag is a stale cache from before #923 landed.)Rebase onto current
mainand keep7e6bd45— it's a clean +1-commit forward move (doc-builder #803, which addstomlifor OpenEnv's own doc build).