| Message ID | 20190408115031.27127-1-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | gitlab-ci: use git clean -ffdx in build each commit test | expand |
> On Apr 8, 2019, at 6:50 AM, Wei Liu <wei.liu2@citrix.com> wrote: > > The build script invoked is designed to run in a pristine checkout. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Doug Goldstein <cardoe@cardoe.com>
On Mon, Apr 08, 2019 at 12:50:31PM +0100, Wei Liu wrote: > The build script invoked is designed to run in a pristine checkout. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > --- > automation/gitlab-ci/build-each-commit.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/automation/gitlab-ci/build-each-commit.sh b/automation/gitlab-ci/build-each-commit.sh > index 275bc71902..879028b5a7 100755 > --- a/automation/gitlab-ci/build-each-commit.sh > +++ b/automation/gitlab-ci/build-each-commit.sh > @@ -15,4 +15,4 @@ fi > echo "Building ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA}" > > NON_SYMBOLIC_REF=1 ./automation/scripts/build-test.sh ${CI_COMMIT_BEFORE_SHA} ${CI_COMMIT_SHA} \ > - bash -c "make -j4 distclean && ./automation/scripts/build" > + bash -c "git clean -ffdx && ./automation/scripts/build" Is this mean that QEMU, OVMF, SeaBIOS, ... are going to be clonned again and again? But maybe it doesn't matter.
On Mon, Apr 08, 2019 at 01:43:57PM +0100, Anthony PERARD wrote: > On Mon, Apr 08, 2019 at 12:50:31PM +0100, Wei Liu wrote: > > The build script invoked is designed to run in a pristine checkout. > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > --- > > automation/gitlab-ci/build-each-commit.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/automation/gitlab-ci/build-each-commit.sh b/automation/gitlab-ci/build-each-commit.sh > > index 275bc71902..879028b5a7 100755 > > --- a/automation/gitlab-ci/build-each-commit.sh > > +++ b/automation/gitlab-ci/build-each-commit.sh > > @@ -15,4 +15,4 @@ fi > > echo "Building ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA}" > > > > NON_SYMBOLIC_REF=1 ./automation/scripts/build-test.sh ${CI_COMMIT_BEFORE_SHA} ${CI_COMMIT_SHA} \ > > - bash -c "make -j4 distclean && ./automation/scripts/build" > > + bash -c "git clean -ffdx && ./automation/scripts/build" > > Is this mean that QEMU, OVMF, SeaBIOS, ... are going to be clonned again > and again? But maybe it doesn't matter. Yes. But I don't think that matters much. Wei. > > -- > Anthony PERARD
On Mon, Apr 08, 2019 at 01:45:15PM +0100, Wei Liu wrote: > On Mon, Apr 08, 2019 at 01:43:57PM +0100, Anthony PERARD wrote: > > On Mon, Apr 08, 2019 at 12:50:31PM +0100, Wei Liu wrote: > > > The build script invoked is designed to run in a pristine checkout. > > > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > > --- > > > automation/gitlab-ci/build-each-commit.sh | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/automation/gitlab-ci/build-each-commit.sh b/automation/gitlab-ci/build-each-commit.sh > > > index 275bc71902..879028b5a7 100755 > > > --- a/automation/gitlab-ci/build-each-commit.sh > > > +++ b/automation/gitlab-ci/build-each-commit.sh > > > @@ -15,4 +15,4 @@ fi > > > echo "Building ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA}" > > > > > > NON_SYMBOLIC_REF=1 ./automation/scripts/build-test.sh ${CI_COMMIT_BEFORE_SHA} ${CI_COMMIT_SHA} \ > > > - bash -c "make -j4 distclean && ./automation/scripts/build" > > > + bash -c "git clean -ffdx && ./automation/scripts/build" > > > > Is this mean that QEMU, OVMF, SeaBIOS, ... are going to be clonned again > > and again? But maybe it doesn't matter. > > Yes. But I don't think that matters much. BTW, distclean deletes those repositories as well. The nature of this specific test means it is best to start in a pristine environment, because we could potentially move the HEAD of all those repositories. Wei.
diff --git a/automation/gitlab-ci/build-each-commit.sh b/automation/gitlab-ci/build-each-commit.sh index 275bc71902..879028b5a7 100755 --- a/automation/gitlab-ci/build-each-commit.sh +++ b/automation/gitlab-ci/build-each-commit.sh @@ -15,4 +15,4 @@ fi echo "Building ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA}" NON_SYMBOLIC_REF=1 ./automation/scripts/build-test.sh ${CI_COMMIT_BEFORE_SHA} ${CI_COMMIT_SHA} \ - bash -c "make -j4 distclean && ./automation/scripts/build" + bash -c "git clean -ffdx && ./automation/scripts/build"
The build script invoked is designed to run in a pristine checkout. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- automation/gitlab-ci/build-each-commit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)