CI : fix the failed fsck patch apply in CI #1441
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
lyj199907
requested review from
liubin,
liubogithub and
hsiangkao
and removed request for
a team
Codecov Report
@@ Coverage Diff @@
## master #1441 +/- ##
==========================================
- Coverage 46.27% 46.26% -0.02%
==========================================
Files 123 123
Lines 38878 38878
Branches 38878 38878
==========================================
- Hits 17991 17987 -4
- Misses 19917 19918 +1
- Partials 970 973 +3 |
imeoer
reviewed
Oct 16, 2023
.github/workflows/convert.yml
Outdated
| @@ -73,7 +73,7 @@ jobs: | |||
| run: | | |||
| sudo apt-get update && sudo apt-get install -y build-essential git autotools-dev automake libtool pkg-config uuid-dev liblz4-dev | |||
| git clone https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git | |||
| cd erofs-utils && git apply ../${{ env.FSCK_PATCH_PATH }} && ./autogen.sh && ./configure && make && cd .. | |||
| cd erofs-utils && ./autogen.sh && ./configure && make && cd .. | |||
There was a problem hiding this comment.
It seems we need to apply the patch.
lyj199907
force-pushed
the
ci-fix
branch
3 times, most recently
from
3d29582 to
36bd6a3
Compare
imeoer
reviewed
Oct 24, 2023
.github/workflows/convert.yml
Outdated
| @@ -73,7 +73,7 @@ jobs: | |||
| run: | | |||
| sudo apt-get update && sudo apt-get install -y build-essential git autotools-dev automake libtool pkg-config uuid-dev liblz4-dev | |||
| git clone https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git | |||
| cd erofs-utils && git apply ../${{ env.FSCK_PATCH_PATH }} && ./autogen.sh && ./configure && make && cd .. | |||
| cd erofs-utils && git checkout v1.6 && git apply ../${{ env.FSCK_PATCH_PATH }} && ./autogen.sh && ./configure && make && cd .. | |||
There was a problem hiding this comment.
It seems to have two spaces between v1.6 and &&.
There was a problem hiding this comment.
I have resolved it
lyj199907
force-pushed
the
ci-fix
branch
2 times, most recently
from
018b6c7 to
0fb4509
Compare
lyj199907
changed the title
lyj199907
force-pushed
the
ci-fix
branch
2 times, most recently
from
526a048 to
43a8501
Compare
Signed-off-by: liyaojie <[email protected]>
imeoer
approved these changes
Oct 24, 2023
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.
The resolution to #1438.
We checked out the v1.6 branch instead of the master branch for erofs-utils.