From 3c319daac0f55a9b2360c49c5556f9e6753c9932 Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:15:17 +0300 Subject: [PATCH 1/6] #58 add macos to ci --- .github/workflows/cmake.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 74269e1..84c71aa 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -11,13 +11,14 @@ env: jobs: build: - runs-on: ubuntu-latest strategy: matrix: ctect_option: - "-DCHAIVM_ADD_MEM_SANITIZER=OFF -DCHAIVM_ADD_THREAD_SANITIZER=OFF" - "-DCHAIVM_ADD_MEM_SANITIZER=OFF -DCHAIVM_ADD_THREAD_SANITIZER=ON" - "-DCHAIVM_ADD_MEM_SANITIZER=ON -DCHAIVM_ADD_THREAD_SANITIZER=OFF" + os: [ ubuntu-latest, macos-12 ] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 with: From 7d6fb21190da5d01d7a6996b8c09186d6e3a52d2 Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:27:58 +0300 Subject: [PATCH 2/6] #58 python dependencies --- .github/workflows/cmake.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 84c71aa..53e4b43 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -24,6 +24,9 @@ jobs: with: submodules: recursive + - name: Install python dependencies + run: python -m pip install Jinja2 + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{matrix.ctect_option}} From d8e6de4c8740edae5dcd47d540367346e3531816 Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:31:10 +0300 Subject: [PATCH 3/6] #58 python dependencies --- .github/workflows/cmake.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 53e4b43..bd73818 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -25,7 +25,9 @@ jobs: submodules: recursive - name: Install python dependencies - run: python -m pip install Jinja2 + run: | + python -m pip install --upgrade pip + python -m pip install Jinja2 - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{matrix.ctect_option}} From cc8bb4c674c6ca4cf1c53d9319964f820dcf3fff Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:38:18 +0300 Subject: [PATCH 4/6] #58 python dependencies --- .github/workflows/cmake.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index bd73818..02ddba9 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -24,6 +24,11 @@ jobs: with: submodules: recursive + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' + - name: Install python dependencies run: | python -m pip install --upgrade pip From 7b1595b86bbed1fd6dc80aa8f53bcf53449f70bd Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:51:48 +0300 Subject: [PATCH 5/6] #58 python dependencies --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 02ddba9..5437073 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -32,7 +32,7 @@ jobs: - name: Install python dependencies run: | python -m pip install --upgrade pip - python -m pip install Jinja2 + pip install Jinja2 - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{matrix.ctect_option}} From a415bcc080dadbfceb6c63752852d03dc7178ac7 Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:53:18 +0300 Subject: [PATCH 6/6] #58 macos-latest --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 5437073..df718d1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -17,7 +17,7 @@ jobs: - "-DCHAIVM_ADD_MEM_SANITIZER=OFF -DCHAIVM_ADD_THREAD_SANITIZER=OFF" - "-DCHAIVM_ADD_MEM_SANITIZER=OFF -DCHAIVM_ADD_THREAD_SANITIZER=ON" - "-DCHAIVM_ADD_MEM_SANITIZER=ON -DCHAIVM_ADD_THREAD_SANITIZER=OFF" - os: [ ubuntu-latest, macos-12 ] + os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3