diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 99f2ae7..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,29 +0,0 @@ -build: false - -os: Visual Studio 2015 - -platform: - - x64 - -environment: - matrix: - - MINICONDA: C:\xsimd-conda - -init: - - "ECHO %MINICONDA%" - - C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\VC\vcvarsall.bat %PLATFORM% - - ps: Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe' C:\Miniconda.exe - - cmd: C:\Miniconda.exe /S /D=C:\xsimd-conda - - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%MINICONDA%\\Library\\bin;%PATH%" - -install: - - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - - conda info -a - - conda install gtest cmake xtl==0.7.0 nlohmann_json -c conda-forge - - cmake -G "NMake Makefiles" -DDOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -D CMAKE_BUILD_TYPE=Release . - - nmake test_xproperty - - cd test - -build_script: - - .\test_xproperty diff --git a/.azure-pipelines/azure-pipelines-linux-clang.yml b/.azure-pipelines/azure-pipelines-linux-clang.yml deleted file mode 100644 index f1d6894..0000000 --- a/.azure-pipelines/azure-pipelines-linux-clang.yml +++ /dev/null @@ -1,42 +0,0 @@ -jobs: - - job: 'Linux_0' - strategy: - matrix: - clang_4: - llvm_version: '4.0' - clang_5: - llvm_version: '5.0' - clang_6: - llvm_version: '6.0' - clang_7: - llvm_version: '7' - clang_8: - llvm_version: '8' - clang_9: - llvm_version: '9' - pool: - vmImage: ubuntu-16.04 - variables: - CC: clang-$(llvm_version) - CXX: clang++-$(llvm_version) - timeoutInMinutes: 360 - steps: - - - script: | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - if [[ $(llvm_version) == '4.0' || $(llvm_version) == '5.0' ]]; then - sudo apt-get update - sudo apt-get --no-install-suggests --no-install-recommends install gcc-4.9 clang-$(llvm_version) - else - LLVM_VERSION=$(llvm_version) - get -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-$LLVM_VERSION main" - sudo apt-get update - sudo apt-get --no-install-suggests --no-install-recommends install clang-$(llvm_version) - fi - displayName: Install build toolchain - - - bash: echo "##vso[task.prependpath]$CONDA/bin" - displayName: Add conda to PATH - - - template: unix-build.yml diff --git a/.azure-pipelines/azure-pipelines-linux-gcc.yml b/.azure-pipelines/azure-pipelines-linux-gcc.yml deleted file mode 100644 index bf18b99..0000000 --- a/.azure-pipelines/azure-pipelines-linux-gcc.yml +++ /dev/null @@ -1,37 +0,0 @@ -jobs: - - job: 'Linux_1' - strategy: - matrix: - gcc_4: - gcc_version: '4.9' - gcc_5: - gcc_version: '5' - gcc_6: - gcc_version: '6' - gcc_7: - gcc_version: '7' - gcc_8: - gcc_version: '8' - gcc_9: - gcc_version: '9' - pool: - vmImage: ubuntu-16.04 - variables: - CC: gcc-$(gcc_version) - CXX: g++-$(gcc_version) - timeoutInMinutes: 360 - steps: - - - script: | - if [[ $(gcc_version) == '4.9' || $(gcc_version) == '6' ]]; then - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - sudo apt-get update - sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version) - fi - displayName: Install build toolchain - - - bash: echo "##vso[task.prependpath]$CONDA/bin" - displayName: Add conda to PATH - - - template: unix-build.yml - diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml deleted file mode 100644 index 282a8ac..0000000 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,28 +0,0 @@ -jobs: - - job: 'OSX' - strategy: - matrix: - macOS_10_14: - image_name: 'macOS-10.14' - macOS_10_15: - image_name: 'macOS-10.15' - pool: - vmImage: $(image_name) - variables: - CC: clang - CXX: clang++ - timeoutInMinutes: 360 - steps: - - script: | - echo "Removing homebrew for Azure to avoid conflicts with conda" - curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew - chmod +x ~/uninstall_homebrew - ~/uninstall_homebrew -f -q - displayName: Remove homebrew - - - bash: | - echo "##vso[task.prependpath]$CONDA/bin" - sudo chown -R $USER $CONDA - displayName: Add conda to PATH - - - template: unix-build.yml diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml deleted file mode 100644 index 5db00ac..0000000 --- a/.azure-pipelines/unix-build.yml +++ /dev/null @@ -1,27 +0,0 @@ -steps: - - script: | - conda config --set always_yes yes --set changeps1 no - conda update -q conda - conda env create --file environment-dev.yml - displayName: Install dependencies - - - script: | - source activate xproperty - mkdir build - cd build - cmake -DDOWNLOAD_GTEST=ON $(Build.SourcesDirectory) - displayName: Configure xproperty - workingDirectory: $(Build.BinariesDirectory) - - - script: | - source activate xproperty - make -j2 test_xproperty - displayName: Build xproperty - workingDirectory: $(Build.BinariesDirectory)/build - - - script: | - source activate xproperty - cd test - ./test_xproperty - displayName: Test xproperty - workingDirectory: $(Build.BinariesDirectory)/build/test diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 712f1e1..35e6d06 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,9 +87,10 @@ jobs: shell: cmd /C call {0} run: | set CL=/MP - ninja build + ninja working-directory: build - name: Test - run: .\test_xproperty + shell: cmd /C call {0} + run: test_xproperty working-directory: build\test diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index bbce686..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,7 +0,0 @@ -trigger: - - master - -jobs: - # - template: ./.azure-pipelines/azure-pipelines-linux-clang.yml - #- template: ./.azure-pipelines/azure-pipelines-linux-gcc.yml - #- template: ./.azure-pipelines/azure-pipelines-osx.yml