diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 175bcf5d..e6df8338 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,25 +4,3 @@ variables: releaseExamples: 'controlgallery cpp-multithread datetime drawtext histogram tester timer' jobs: -- job: linux_386_static - displayName: 'Linux 386 Static' - pool: - vmImage: 'ubuntu-16.04' - workspace: - clean: all - steps: - - template: azure-pipelines/setup-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - script: sudo apt-get install mingw-w64 ninja-build - - template: azure-pipelines/configure.yml - parameters: - defaultLibrary: static - extraOptions: --cross-file=azure-pipelines/cross-386-mingw.txt - - template: azure-pipelines/build.yml -# - template: azure-pipelines/artifacts.yml -# parameters: -# os: linux -# arch: 386 -# libtype: static -# libfiles: libui.a -# osHeader: ui_unix.h diff --git a/azure-pipelines/configure.yml b/azure-pipelines/configure.yml index f4bada4d..aec307fe 100644 --- a/azure-pipelines/configure.yml +++ b/azure-pipelines/configure.yml @@ -3,10 +3,9 @@ parameters: beforeConfigure: '' defaultLibrary: 'must-be-set' - extraOptions: '' steps: - script: | ${{ parameters.beforeConfigure }} - meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }} ${{ parameters.extraOptions }} + meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }} displayName: 'Configure' diff --git a/azure-pipelines/cross-386-mingw.txt b/azure-pipelines/cross-386-mingw.txt deleted file mode 100644 index d5ef59ad..00000000 --- a/azure-pipelines/cross-386-mingw.txt +++ /dev/null @@ -1,16 +0,0 @@ -[binaries] -c = '/usr/bin/i686-w64-mingw32-gcc-posix' -cpp = '/usr/bin/i686-w64-mingw32-g++-posix' -ar = '/usr/bin/i686-w64-mingw32-gcc-ar-posix' -strip = '/usr/bin/i686-w64-mingw32-strip' -pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config' -windres = '/usr/bin/i686-w64-mingw32-windres' - -[properties] -root = '/usr/i686-w64-mingw32' - -[host_machine] -system = 'windows' -cpu_family = 'x86' -cpu = 'i686' -endian = 'little' diff --git a/azure-pipelines/install-latest-meson.yml b/azure-pipelines/install-latest-meson.yml index 588bd9d7..4c86a01e 100644 --- a/azure-pipelines/install-latest-meson.yml +++ b/azure-pipelines/install-latest-meson.yml @@ -3,6 +3,5 @@ steps: - script: | python -m pip install --upgrade pip setuptools wheel - # 0.50.0 has a bug that prevents cross-builds (like our MinGW-w64 build) to not work properly - pip install 'meson!=0.50.0' + pip install meson displayName: 'Install Latest Meson'