| Message ID | 20221125104951.3169611-2-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] .gitlab-ci.d/windows.yml: Unify the prerequisite packages | expand |
On 25/11/2022 11.49, Bin Meng wrote: > From: Bin Meng <bin.meng@windriver.com> > > At present the build scripts of 32-bit and 64-bit are inconsistent. > Let's keep them consistent for easier maintenance. > > While we are here, add some comments to explain that for the 64-bit > job, "--without-default-devices" is a must have, at least for now. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- > > .gitlab-ci.d/windows.yml | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml > index 99d78c2213..c6de65c784 100644 > --- a/.gitlab-ci.d/windows.yml > +++ b/.gitlab-ci.d/windows.yml > @@ -61,12 +61,19 @@ msys2-64bit: > mingw-w64-x86_64-usbredir > mingw-w64-x86_64-zstd " > - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory > - - $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment > + - $env:MSYSTEM = 'MINGW64' # Start a 64-bit MinGW environment > - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink > - - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu > + - mkdir output > + - cd output > + # Note: do not remove "--without-default-devices"! > + # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices" > + # changed to compile QEMU with the --without-default-devices switch > + # for the msys2 64-bit job, due to the build could not complete within > + # the project timeout. > + - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu > --enable-capstone --without-default-devices' > - - .\msys64\usr\bin\bash -lc 'make' > - - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlog.txt; exit 1; } ;' > + - ..\msys64\usr\bin\bash -lc 'make' > + - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' > > msys2-32bit: > extends: .shared_msys2_builder > @@ -100,10 +107,11 @@ msys2-32bit: > mingw-w64-i686-usbredir > mingw-w64-i686-zstd " > - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory > - - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment > + - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinGW environment > - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink > - mkdir output > - cd output > - - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" > + - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu > + --enable-capstone' Capstone should automatically be detected if it is installed, so the --enable-capstone seems redundant here ... does it not work without it? Thomas
On Fri, Nov 25, 2022 at 6:56 PM Thomas Huth <thuth@redhat.com> wrote: > > On 25/11/2022 11.49, Bin Meng wrote: > > From: Bin Meng <bin.meng@windriver.com> > > > > At present the build scripts of 32-bit and 64-bit are inconsistent. > > Let's keep them consistent for easier maintenance. > > > > While we are here, add some comments to explain that for the 64-bit > > job, "--without-default-devices" is a must have, at least for now. > > > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > > --- > > > > .gitlab-ci.d/windows.yml | 20 ++++++++++++++------ > > 1 file changed, 14 insertions(+), 6 deletions(-) > > > > diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml > > index 99d78c2213..c6de65c784 100644 > > --- a/.gitlab-ci.d/windows.yml > > +++ b/.gitlab-ci.d/windows.yml > > @@ -61,12 +61,19 @@ msys2-64bit: > > mingw-w64-x86_64-usbredir > > mingw-w64-x86_64-zstd " > > - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory > > - - $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment > > + - $env:MSYSTEM = 'MINGW64' # Start a 64-bit MinGW environment > > - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink > > - - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu > > + - mkdir output > > + - cd output > > + # Note: do not remove "--without-default-devices"! > > + # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices" > > + # changed to compile QEMU with the --without-default-devices switch > > + # for the msys2 64-bit job, due to the build could not complete within > > + # the project timeout. > > + - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu > > --enable-capstone --without-default-devices' > > - - .\msys64\usr\bin\bash -lc 'make' > > - - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlog.txt; exit 1; } ;' > > + - ..\msys64\usr\bin\bash -lc 'make' > > + - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' > > > > msys2-32bit: > > extends: .shared_msys2_builder > > @@ -100,10 +107,11 @@ msys2-32bit: > > mingw-w64-i686-usbredir > > mingw-w64-i686-zstd " > > - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory > > - - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment > > + - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinGW environment > > - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink > > - mkdir output > > - cd output > > - - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" > > + - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu > > + --enable-capstone' > > Capstone should automatically be detected if it is installed, so the > --enable-capstone seems redundant here ... does it not work without it? > --enable-capstone is redundant. Will remove in v2. Regards, Bin
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 99d78c2213..c6de65c784 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -61,12 +61,19 @@ msys2-64bit: mingw-w64-x86_64-usbredir mingw-w64-x86_64-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - - $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment + - $env:MSYSTEM = 'MINGW64' # Start a 64-bit MinGW environment - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu + - mkdir output + - cd output + # Note: do not remove "--without-default-devices"! + # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices" + # changed to compile QEMU with the --without-default-devices switch + # for the msys2 64-bit job, due to the build could not complete within + # the project timeout. + - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu --enable-capstone --without-default-devices' - - .\msys64\usr\bin\bash -lc 'make' - - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlog.txt; exit 1; } ;' + - ..\msys64\usr\bin\bash -lc 'make' + - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' msys2-32bit: extends: .shared_msys2_builder @@ -100,10 +107,11 @@ msys2-32bit: mingw-w64-i686-usbredir mingw-w64-i686-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment + - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinGW environment - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" + - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu + --enable-capstone' - ..\msys64\usr\bin\bash -lc 'make' - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;'