From a59b56e4a3c9122059067f9dd0d2ce0bdc43bd8b Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Mon, 16 Dec 2024 06:21:29 +0100 Subject: [PATCH 1/2] Fixed the ci --- .github/workflows/main.yml | 14 ++++++++++---- environment-dev.yml | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ce0b8c..32738bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,10 +3,10 @@ on: workflow_dispatch: push: branches: - - master + - main pull_request: branches: - - master + - main defaults: run: @@ -42,6 +42,8 @@ jobs: -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \ -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \ -DDOWNLOAD_GTEST=ON \ + -DCMAKE_C_COMPILER=$CC \ + -DCMAKE_CXX_COMPILER=$CXX \ -DCMAKE_INSTALL_LIBDIR=lib working-directory: build @@ -49,6 +51,10 @@ jobs: run: make -j ${{ steps.cpu-cores.outputs.count }} working-directory: build + - name: Install + run: make install + working-directory: build + - name: Test xeus-calc run: ./test_xeus_calc working-directory: build/test @@ -82,13 +88,13 @@ jobs: cmake .. ^ -G Ninja ^ -DCMAKE_BUILD_TYPE=Release ^ - -DDOWNLOAD_GTEST=ON ^ + -DDOWNLOAD_GTEST=OFF ^ -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" ^ -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" ^ -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%" working-directory: build - - name: Build + - name: Build and Install run: | set CL=/MP ninja install diff --git a/environment-dev.yml b/environment-dev.yml index 87b7100..e595ffb 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -4,6 +4,8 @@ channels: dependencies: # Build dependencies - cmake + - cxx-compiler + - ninja # Host dependencies - xeus-zmq=3.1.0 - nlohmann_json From 976738352aef9953d9b6ae89fe7f2a136db1f211 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Mon, 16 Dec 2024 06:28:30 +0100 Subject: [PATCH 2/2] Remove old CI files --- .appveyor.yml | 48 ---------------------- .azure-pipelines/azure-pipelines-linux.yml | 18 -------- .azure-pipelines/azure-pipelines-osx.yml | 27 ------------ .azure-pipelines/unix-build.yml | 36 ---------------- 4 files changed, 129 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .azure-pipelines/azure-pipelines-linux.yml delete mode 100644 .azure-pipelines/azure-pipelines-osx.yml delete mode 100644 .azure-pipelines/unix-build.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 3554d33..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,48 +0,0 @@ -build: false - -platform: - - x64 - -image: - - Visual Studio 2017 - - Visual Studio 2015 - -environment: - matrix: - - MINICONDA: C:\\xeus-conda - -init: - - "ECHO %MINICONDA%" - - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set VCVARPATH="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" - - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set VCARGUMENT=%PLATFORM% - - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" if "%PLATFORM%" == "x64" set VCVARPATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" if "%PLATFORM%" == "x86" set VCVARPATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" - - echo "%VCVARPATH% %VCARGUMENT%" - - "%VCVARPATH% %VCARGUMENT%" - - ps: if($env:Platform -eq "x64"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe' C:\Miniconda.exe; echo "Done"} - - ps: if($env:Platform -eq "x86"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86.exe' C:\Miniconda.exe; echo "Done"} - - cmd: C:\Miniconda.exe /S /D=C:\xeus-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 - # Host dependencies - - conda install xtl=0.7.3 xeus=2.1.0 nlohmann_json cppzmq gtest=1.8.0 -c conda-forge - # Build dependencies - - conda install cmake -c conda-forge - # Build and install xeus-calc - - mkdir build - - cd build - - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D XEXTRA_JUPYTER_DATA_DIR=%MINICONDA%\\share\\jupyter -D BUILD_TESTS=ON .. - - nmake - - nmake install - # Install test dependencies - - -build_script: - - cd test - - dir - - cd .. - #- .\test\test_xeus_calc.exe diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml deleted file mode 100644 index 03fe61e..0000000 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ /dev/null @@ -1,18 +0,0 @@ -jobs: - - job: 'Linux' - strategy: - matrix: - gcc_7: - image_name: 'ubuntu-18.04' - pool: - vmImage: $(image_name) - timeoutInMinutes: 30 - steps: - - - bash: echo "##vso[task.prependpath]$CONDA/bin" - displayName: Add conda to PATH - - - template: unix-build.yml - parameters: - platform: 'Linux' - diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml deleted file mode 100644 index 17d9c11..0000000 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,27 +0,0 @@ -jobs: - - job: 'OSX' - strategy: - matrix: - macOS_10_15: - image_name: 'macOS-10.15' - pool: - vmImage: $(image_name) - variables: - CC: clang - CXX: clang++ - timeoutInMinutes: 30 - steps: - - script: | - echo "Removing homebrew for Azure to avoid conflicts with conda" - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall.sh)" - displayName: Remove homebrew - - - bash: | - echo "##vso[task.prependpath]$CONDA/bin" - sudo chown -R $USER $CONDA - displayName: Add conda to PATH - - - template: unix-build.yml - parameters: - platform: 'OSX' - diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml deleted file mode 100644 index 6b686fe..0000000 --- a/.azure-pipelines/unix-build.yml +++ /dev/null @@ -1,36 +0,0 @@ -parameters: - - name: 'platform' - type: string - -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 xeus-calc - conda install gxx_linux-64 libcxx -c conda-forge - condition: eq('${{ parameters.platform }}', 'Linux') - displayName: Install conda-forge compilers - - - script: | - source activate xeus-calc - mkdir build - cd build - cmake -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX $(Build.SourcesDirectory) - displayName: Configure xeus-calc - workingDirectory: $(Build.BinariesDirectory) - - - script: | - source activate xeus-calc - make install -j2 - displayName: Build xeus-calc - workingDirectory: $(Build.BinariesDirectory)/build - - - script: | - source activate xeus-calc - ./test_xeus_calc - displayName: Test xeus-calc (C++) - workingDirectory: $(Build.BinariesDirectory)/build/test