diff options
| -rw-r--r-- | .github/workflows/ci.yml | 25 | ||||
| -rw-r--r-- | .travis.yml | 46 | ||||
| -rw-r--r-- | include/llfio/revision.hpp | 6 |
3 files changed, 47 insertions, 30 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 2acffa24..00000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: "LLIO CI" - -on: [push, pull_request] - -jobs: - build: - name: ${{ matrix.config.name }} - runs-on: ${{ matrix.config.os }} - env: ${{ matrix.config.env }} - strategy: - fail-fast: false - matrix: - config: - - { - name: "MacOS 10.15", - os: macos-10.15, - env: [ CMAKE_CONFIGURE_OPTIONS: "" ], - artifact: "llfio-v2.0-binaries-darwin64-${{ github.sha }}.tgz" - } - - steps: - - uses: actions/checkout@v2 - - - name: "cmake tests (error code)" - run: ctest -S .ci.cmake -VV --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS diff --git a/.travis.yml b/.travis.yml index 7941deab..9cac541c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ git: submodules: false os: - linux -# - osx ## disabled until MacOS 10.15 deploys on Travis -#osx_image: xcode11.4 + - osx +osx_image: xcode11.4 branches: only: - develop @@ -36,52 +36,78 @@ matrix: include: - name: "g++ 7.5 x64 cmake tests (error_code)" compiler: g++ + os: linux env: NAME=x64_EC_tests - name: "clang++ 7.0 x64 cmake tests (error_code)" compiler: clang++ + os: linux env: NAME=x64_EC_tests - name: "libc++ x64 cmake tests (error_code)" compiler: clang++-10 + os: linux env: - NAME=x64_EC_tests - CMAKE_CONFIGURE_OPTIONS=-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake + - name: "Xcode 11.4 x64 cmake tests (error_code)" + compiler: clang++ + os: osx + env: NAME=x64_EC_tests - name: "g++ 7.5 x64 cmake tests (status_code)" compiler: g++ + os: linux env: - NAME=x64_SC_tests - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "clang++ 7.0 x64 cmake tests (status_code)" compiler: clang++ + os: linux env: - NAME=x64_SC_tests - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "libc++ x64 cmake tests (status_code)" compiler: clang++-10 + os: linux env: - NAME=x64_SC_tests - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake + - name: "Xcode 11.4 x64 cmake tests (status_code)" + compiler: clang++ + os: osx + env: + - NAME=x64_SC_tests + - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "g++ ARM32 cmake build (error_code)" compiler: g++ + os: linux env: NAME=ARM32_EC_build - name: "g++ ARM32 cmake build (status_code)" compiler: g++ + os: linux env: - NAME=ARM32_SC_build - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "Documentation" compiler: clang++ + os: linux env: NAME=Documentation - name: "g++ 7.5 x64 Programs (error_code)" compiler: g++ + os: linux env: NAME=x64_EC_programs - name: "clang++ 7.0 x64 Programs (error_code)" compiler: clang++ + os: linux env: NAME=x64_EC_programs - name: "libc++ x64 Programs (error_code)" compiler: clang++-10 + os: linux env: - NAME=x64_EC_programs - CMAKE_CONFIGURE_OPTIONS=-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake + - name: "Xcode 11.4 x64 Programs (error_code)" + compiler: clang++ + os: osx + env: NAME=x64_EC_programs # - name: "x64 Programs (status_code)" # compiler: # - g++ @@ -92,30 +118,46 @@ matrix: # - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "g++ 7.5 Installability (error_code)" compiler: g++ + os: linux env: NAME=x64_EC_install - name: "clang++ 7.0 Installability (error_code)" compiler: clang++ + os: linux env: NAME=x64_EC_install - name: "libc++ Installability (error_code)" compiler: clang++-10 + os: linux env: - NAME=x64_EC_install - CMAKE_CONFIGURE_OPTIONS=-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake + - name: "Xcode 11.4 Installability (error_code)" + compiler: clang++ + os: osx + env: NAME=x64_EC_install - name: "g++ 7.5 Installability (status_code)" compiler: g++ + os: linux env: - NAME=x64_SC_install - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "clang++ 7.0 Installability (status_code)" compiler: clang++ + os: linux env: - NAME=x64_SC_install - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "libc++ Installability (status_code)" compiler: clang++-10 + os: linux env: - NAME=x64_SC_install - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake + - name: "Xcode 11.4 Installability (status_code)" + compiler: clang++ + os: osx + env: + - NAME=x64_SC_install + - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON before_install: - if [ "$TRAVIS_COMPILER" = "clang++-10" ]; then diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index 345faeb2..029275f7 100644 --- a/include/llfio/revision.hpp +++ b/include/llfio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define LLFIO_PREVIOUS_COMMIT_REF 7275a4f1a2b6f037bbf1fd456df1395b5d7247c1 -#define LLFIO_PREVIOUS_COMMIT_DATE "2020-05-10 21:36:34 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE 7275a4f1 +#define LLFIO_PREVIOUS_COMMIT_REF dc696a87a36b8158593294895a117f8cc0629c37 +#define LLFIO_PREVIOUS_COMMIT_DATE "2020-05-12 21:34:45 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE dc696a87 |