From 2e85263b0bcfb8b57b281a91a81258eb90628208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 14 Jan 2022 09:50:59 -0700 Subject: [PATCH 1/7] CI: Build a Conda environment --- .github/workflows/CI.yml | 1 + ci/environment.yml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 ci/environment.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f5e6c8a643..cb15f714f0 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,6 +15,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true + environment-file: ci/environment.yml python-version: ${{ matrix.python-version }} - name: Conda info shell: bash -l {0} diff --git a/ci/environment.yml b/ci/environment.yml new file mode 100644 index 0000000000..0cd38e8447 --- /dev/null +++ b/ci/environment.yml @@ -0,0 +1,18 @@ +name: lp +channels: + - conda-forge + - defaults +dependencies: + - llvmdev=11.1.0 + - toml + - pytest + - jupyter + - xeus=1.0.1 + - xtl + - nlohmann_json + - cppzmq + - jupyter_kernel_test + - xonsh + - re2c +# - bison=3.4 [not win] +# - m2-bison=3.4 [win] From 99091ffba627e4a03cfb385fa9f3897e2e2af02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 14 Jan 2022 09:53:50 -0700 Subject: [PATCH 2/7] Install Bison on each platform --- .github/workflows/CI.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index cb15f714f0..5664abd009 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -17,11 +17,22 @@ jobs: auto-update-conda: true environment-file: ci/environment.yml python-version: ${{ matrix.python-version }} + + - name: Install Windows Conda Packages + if: contains(matrix.os, 'windows') + run: conda install m2-bison=3.4 + + - name: Install Linux / macOS Conda Packages + if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') + run: conda install bison=3.4 + - name: Conda info shell: bash -l {0} run: conda info + - name: Conda list shell: pwsh run: conda list + - name: Build and test run: xonsh ci/build.xsh From f928c46ae1facc6c50f773fb2602e4ae5b4facd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 14 Jan 2022 10:00:55 -0700 Subject: [PATCH 3/7] Checkout the repository --- .github/workflows/CI.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5664abd009..5bf1c1f0e7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -12,11 +12,14 @@ jobs: os: ["ubuntu-latest", "macos-latest", "windows-latest"] python-version: ["3.10"] steps: + - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true environment-file: ci/environment.yml python-version: ${{ matrix.python-version }} + auto-activate-base: false - name: Install Windows Conda Packages if: contains(matrix.os, 'windows') From aa0387a948c41f96207f327d0b0e49454728fe26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 14 Jan 2022 10:08:03 -0700 Subject: [PATCH 4/7] Use the bash shell --- .github/workflows/CI.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5bf1c1f0e7..0942ae4379 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,4 +38,7 @@ jobs: run: conda list - name: Build and test - run: xonsh ci/build.xsh + shell: bash -l {0} + run: | + echo $CONDA_PREFIX + xonsh ci/build.xsh From 5c36f230ab3e417856358f35bdd300413eff2447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 14 Jan 2022 10:11:04 -0700 Subject: [PATCH 5/7] Specify conda-forge --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0942ae4379..0bd01fc39a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,7 +23,7 @@ jobs: - name: Install Windows Conda Packages if: contains(matrix.os, 'windows') - run: conda install m2-bison=3.4 + run: conda install -c conda-forge m2-bison=3.4 - name: Install Linux / macOS Conda Packages if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') From d3bbd508b2d44344b95226bad479bedcfb761a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 14 Jan 2022 10:13:12 -0700 Subject: [PATCH 6/7] Specify the shell --- .github/workflows/CI.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0bd01fc39a..6c05f9b7e3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,19 +23,19 @@ jobs: - name: Install Windows Conda Packages if: contains(matrix.os, 'windows') + shell: bash -l {0} run: conda install -c conda-forge m2-bison=3.4 - name: Install Linux / macOS Conda Packages if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') + shell: bash -l {0} run: conda install bison=3.4 - name: Conda info shell: bash -l {0} - run: conda info - - - name: Conda list - shell: pwsh - run: conda list + run: | + conda info + conda list - name: Build and test shell: bash -l {0} From ce4c00708720b49a4d4dd0d6fbbe98baf18fd833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 14 Jan 2022 10:15:58 -0700 Subject: [PATCH 7/7] Use the correct version of Bison on Windows --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6c05f9b7e3..e1548e961b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -24,7 +24,7 @@ jobs: - name: Install Windows Conda Packages if: contains(matrix.os, 'windows') shell: bash -l {0} - run: conda install -c conda-forge m2-bison=3.4 + run: conda install m2-bison=3.0.4 - name: Install Linux / macOS Conda Packages if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')