From cab85309b0cfb728c1b3c8cd2ebdc1773b8f68ce Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 23 Nov 2024 23:42:57 -0500 Subject: [PATCH 1/2] Install libgtk for linux CI runner to build wxpython --- .../matrix-and-codecov-on-merge-to-main.yml | 13 ++++++++++++- .github/workflows/tests-on-pr.yml | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index ff4f6de..ea064dc 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -42,7 +42,17 @@ jobs: conda config --set always_yes yes --set changeps1 no - - name: Install diffpy.labpdfproc and requirements + - name: Install diffpy.labpdfproc and requirements for Linux + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev + conda install --file requirements/test.txt + pip install -r requirements/pip.txt + python -m pip install . --no-deps + + - name: Install diffpy.labpdfproc and requirements for non-Linux + if: runner.os != 'Linux' run: | conda install --file requirements/test.txt pip install -r requirements/pip.txt @@ -59,3 +69,4 @@ jobs: uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index f089057..adcdb8c 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -32,6 +32,11 @@ jobs: conda config --set always_yes yes --set changeps1 no + - name: Install libgtk for Linux + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev + - name: Install diffpy.labpdfproc and requirements run: | conda install --file requirements/test.txt From 0806dab23c2f8e093e955989c68f8d2eba3ecd05 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 23 Nov 2024 23:46:18 -0500 Subject: [PATCH 2/2] Apply precommit --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index ea064dc..ed569c5 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -69,4 +69,3 @@ jobs: uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} -