From 50cc08c72f200a44b4edc55c7feb6208557f2ed1 Mon Sep 17 00:00:00 2001 From: Andrew Straw Date: Fri, 20 Dec 2024 07:45:48 +0100 Subject: [PATCH 1/2] ci: do not run same job twice --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c3bab77..e165222c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-latest] + os: [ubuntu-latest] steps: - uses: actions/checkout@v3 - name: Update package index From fa7bada692f382de162d9d079478a08664584055 Mon Sep 17 00:00:00 2001 From: Andrew Straw Date: Fri, 20 Dec 2024 07:46:11 +0100 Subject: [PATCH 2/2] ci: install libcairo2-dev on ubuntu-latest --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e165222c..c2c0518f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,6 +40,9 @@ jobs: run: python -m pip install --upgrade pip - name: Build and install flydra_core run: python -m pip install ./flydra_core + - name: Install libcairo2-dev (Ubuntu) + if: matrix.os == 'ubuntu-latest' + run: sudo apt-get install -y libcairo2-dev - name: Build and install flydra_analysis run: python -m pip install ./flydra_analysis @@ -55,7 +58,7 @@ jobs: - name: Update package index run: sudo apt-get update - name: Install system packages - run: sudo apt-get install -y libcairo2-dev octave # mayavi2 python3-sympy python3-docopt python3-cherrypy3 python3-pkgconfig python-is-python3 + run: sudo apt-get install -y libcairo2-dev octave - name: Upgrade pip run: python -m pip install --upgrade pip - name: Build and install flydra_core