forked from SoftFever/Orca-deps-wxWidgets
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into web-request
Merge with the latest master in preparation for merging into master. Rebake to resolve conflicts in generated files.
- Loading branch information
Showing
3,934 changed files
with
147,146 additions
and
95,821 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # This workflow does some quick checks. | ||
| name: Code Checks | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| paths: | ||
| - '.github/workflows/code_checks.yml' | ||
| - 'docs/**' | ||
| - 'include/**' | ||
| - 'interface/**' | ||
| - 'misc/suppressions/**' | ||
| - '**/*.md' | ||
| - '!docs/changes*txt' | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| paths: | ||
| - '.github/workflows/code_checks.yml' | ||
| - 'docs/**' | ||
| - 'include/**' | ||
| - 'interface/**' | ||
| - 'misc/suppressions/**' | ||
| - '**/*.md' | ||
| - '!docs/changes*txt' | ||
|
|
||
| jobs: | ||
| check-unix: | ||
| runs-on: ubuntu-20.04 | ||
| name: Check Spelling | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Install codespell | ||
| run: | | ||
| pip3 install --no-warn-script-location codespell==1.17.1 | ||
| - name: Run codespell | ||
| run: | | ||
| CODESPELL=$HOME/.local/bin/codespell ./misc/scripts/spellcheck | ||
| check-whitespace: | ||
| runs-on: ubuntu-20.04 | ||
| name: Check Whitespace | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Check for trailing whitespace and TABs | ||
| run: | | ||
| git fetch --depth=1 origin master | ||
| git -c core.whitespace=blank-at-eol,blank-at-eof,space-before-tab,cr-at-eol,tab-in-indent \ | ||
| diff --check origin/master \ | ||
| ':!Makefile.in' \ | ||
| ':!config.guess' \ | ||
| ':!config.sub' \ | ||
| ':!configure' \ | ||
| ':!descrip.mms' \ | ||
| ':!install-sh' \ | ||
| ':!**/*akefile*' \ | ||
| ':!**/*.sln' \ | ||
| ':!**/*.vcproj' \ | ||
| ':!**/*.xpm' |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,45 +3,111 @@ | |
| # It is used automatically for the repositories on Github if it's found in the | ||
| # root directory of the project. | ||
| language: cpp | ||
| sudo: required | ||
|
|
||
| matrix: | ||
| # Specify the default platform. | ||
| os: linux | ||
| dist: xenial | ||
|
|
||
| jobs: | ||
| include: | ||
| - dist: precise | ||
| compiler: gcc | ||
| - dist: trusty | ||
| compiler: gcc | ||
| - dist: trusty | ||
| env: wxGTK_VERSION=2 wxUSE_XVFB=1 | ||
| name: wxGTK 2 Ubuntu 14.04 | ||
| - dist: xenial | ||
| compiler: gcc | ||
| env: wxCONFIGURE_FLAGS="--enable-utf8 --enable-utf8only --enable-monolithic" | ||
| - dist: trusty | ||
| env: wxGTK_VERSION=3 | ||
| name: wxGTK 3 Ubuntu 16.04 | ||
| - dist: bionic | ||
| compiler: gcc | ||
| env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" | ||
| - dist: trusty | ||
| env: wxGTK_VERSION=2 wxCONFIGURE_FLAGS="--enable-utf8 --enable-utf8only --enable-monolithic" wxUSE_XVFB=1 | ||
| name: wxGTK 2 UTF-8 Ubuntu 18.04 | ||
| - dist: bionic | ||
| compiler: gcc | ||
| env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --disable-compat30 --enable-stl" wxMAKEFILE_CXXFLAGS=-std=c++11 wxMAKEFILE_LDFLAGS=-Wl,--no-as-needed wxUSE_XVFB=1 | ||
| name: wxGTK 3 STL Ubuntu 18.04 | ||
| - dist: bionic | ||
| compiler: clang | ||
| env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs --disable-webview" | ||
| - dist: trusty | ||
| env: wxGTK_VERSION=2 wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs --disable-webview" wxUSE_XVFB=1 | ||
| name: wxGTK 2 clang Ubuntu 18.04 | ||
| - dist: bionic | ||
| compiler: gcc | ||
| env: wxGTK_VERSION=3 wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" | ||
| name: wxGTK 3 CMake Ubuntu 18.04 | ||
| - dist: focal | ||
| compiler: gcc | ||
| env: wxGTK_VERSION=2 wxCONFIGURE_FLAGS="--disable-compat30 --disable-unicode" wxSKIP_SAMPLES=1 | ||
| name: wxGTK ANSI Ubuntu 20.04 | ||
| - dist: focal | ||
| compiler: gcc | ||
| env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" | ||
| env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--disable-compat30 --disable-sys-libs" wxSKIP_SAMPLES=1 wxUSE_ASAN=1 | ||
| name: wxGTK Ubuntu 20.04 with ASAN | ||
| - os: osx | ||
| osx_image: xcode6.4 | ||
| osx_image: xcode7.3 | ||
| compiler: clang | ||
| env: wxCONFIGURE_FLAGS="--enable-cxx11" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" wxSKIP_SAMPLES=1 | ||
| env: wxSKIP_SAMPLES=1 | ||
| name: wxOSX Xcode 7.3 | ||
| - os: osx | ||
| osx_image: xcode9.4 | ||
| compiler: clang | ||
| env: wxTOOLSET=cmake wxCMAKE_GENERATOR=Xcode wxCMAKE_DEFINES="-DCMAKE_CXX_STANDARD=11" | ||
| - dist: trusty | ||
| name: wxOSX CMake Xcode 9.4 | ||
| - os: osx | ||
| osx_image: xcode11.3 | ||
| env: wxCONFIGURE_FLAGS="--enable-monolithic --with-cxx=17 --with-macosx-version-min=10.12 --enable-stl" | ||
| name: wxOSX Xcode 11.3 | ||
| - os: osx | ||
| osx_image: xcode11.4 | ||
| env: wxCONFIGURE_FLAGS="--enable-monolithic --with-cxx=17 --host=i686-apple-darwin_sim --build=x86_64-apple-darwin17.7.0 --with-osx_iphone --with-macosx-version-min=10.0 --with-macosx-sdk=$(xcrun --sdk iphonesimulator --show-sdk-path) --enable-stl --disable-sys-libs" wxALLOW_WARNINGS=1 wxSKIP_GUI=1 wxSKIP_TESTING=1 wxSKIP_SAMPLES=1 | ||
| name: wxOSX iOS Xcode 11.4 | ||
| - os: osx | ||
| osx_image: xcode11.4 | ||
| env: wxTOOLSET=cmake wxCMAKE_GENERATOR=Xcode wxCMAKE_DEFINES="-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_FIND_ROOT_PATH=/usr/local -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" wxCMAKE_SAMPLES=OFF wxCMAKE_TESTS=OFF | ||
| name: wxOSX iOS CMake Xcode 11.4 | ||
| - dist: bionic | ||
| compiler: gcc | ||
| env: wxCONFIGURE_FLAGS="--with-x11 --enable-pch --disable-stc" wxSKIP_SAMPLES=1 | ||
| - dist: trusty | ||
| name: wxX11 Ubuntu 18.04 | ||
| - dist: bionic | ||
| compiler: gcc | ||
| env: wxCONFIGURE_FLAGS="--with-directfb --enable-pch --disable-stc" wxSKIP_SAMPLES=1 | ||
| - dist: trusty | ||
| env: wxCONFIGURE_FLAGS="--with-directfb --enable-pch --disable-stc" wxSKIP_SAMPLES=1 wxALLOW_WARNINGS=1 | ||
| name: wxDFB Ubuntu 18.04 | ||
| - dist: bionic | ||
| compiler: gcc | ||
| env: wxCONFIGURE_FLAGS="--with-motif --enable-pch --disable-stc" wxSKIP_SAMPLES=1 | ||
| - dist: trusty | ||
| name: wxMotif Ubuntu 18.04 | ||
| - dist: bionic | ||
| compiler: gcc | ||
| env: wxCONFIGURE_FLAGS="--with-qt --enable-pch" wxSKIP_SAMPLES=1 | ||
| env: wxCONFIGURE_FLAGS="--with-qt --enable-pch --without-opengl" wxSKIP_SAMPLES=1 | ||
| name: wxQt Ubuntu 18.04 | ||
| - os: linux | ||
| arch: arm64 | ||
| env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--disable-sys-libs" wxLXC=1 | ||
| name: wxGTK ARM64 | ||
| - os: linux | ||
| arch: ppc64le | ||
| env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1 | ||
| name: wxBase PowerPC64 | ||
| - os: linux | ||
| arch: s390x | ||
| env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1 | ||
| name: wxBase S/390 | ||
|
|
||
| # The environments running these builds are flaky and often fail for the | ||
| # reasons that have nothing to do with the build itself. | ||
| allow_failures: | ||
| - os: linux | ||
| arch: arm64 | ||
| env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--disable-sys-libs" wxLXC=1 | ||
| name: wxGTK ARM64 | ||
| - os: linux | ||
| arch: ppc64le | ||
| env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1 | ||
| name: wxBase PowerPC64 | ||
| - os: linux | ||
| arch: s390x | ||
| env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1 | ||
| name: wxBase S/390 | ||
|
|
||
| branches: | ||
| only: | ||
|
|
@@ -50,11 +116,12 @@ branches: | |
|
|
||
| notifications: | ||
| email: | ||
| if: repo = wxWidgets/wxWidgets | ||
| recipients: | ||
| - [email protected] | ||
| on_success: change | ||
| on_failure: change | ||
|
|
||
| before_install: ./build/tools/before_install.sh | ||
|
|
||
| script: bash build/tools/travis-ci.sh | ||
| script: ./build/tools/travis-ci.sh | ||
Submodule catch
updated
2 files
| +4 −2 | include/internal/catch_debugger.h | |
| +4 −2 | single_include/catch.hpp |
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
Oops, something went wrong.