Skip to content

Commit 815cb67

Browse files
committed
GH Actions: upgrade to ubuntu-latest; use conda to install graphviz
1 parent fe0e061 commit 815cb67

File tree

5 files changed

+30
-7
lines changed

5 files changed

+30
-7
lines changed

.github/actions/install-dependencies/action.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Install dependencies
2-
description: apt-get dependencies
2+
description: Install dependencies and setup + activate conda env
33

44
runs:
55
using: composite
@@ -15,11 +15,22 @@ runs:
1515
sudo apt-get install -y \
1616
librsvg2-bin \
1717
ghostscript \
18-
graphviz \
1918
pkg-config \
2019
libgraphviz-dev \
2120
gsfonts \
2221
libfreetype6-dev \
2322
libfontconfig1-dev
2423
# Explanation of some of these dependencies:
2524
# https://github.com/ImageMagick/ImageMagick/issues/374#issuecomment-279252866
25+
26+
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169 # v2.1.1
27+
with:
28+
channels: conda-forge
29+
python-version: ${{ matrix.python-version || '' }}
30+
miniforge-version: latest
31+
32+
# use login shell for conda activation
33+
- shell: bash -leo pipefail {0}
34+
run: |
35+
echo "CONDA_PREFIX: ${CONDA_PREFIX}"
36+
conda install -y graphviz

.github/workflows/deploy.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,12 @@ concurrency:
5757

5858
jobs:
5959
deploy:
60-
runs-on: ubuntu-18.04
60+
runs-on: ubuntu-latest
6161
timeout-minutes: 20
62+
defaults:
63+
run:
64+
# use login shell for conda activation
65+
shell: bash -leo pipefail {0}
6266
steps:
6367
- name: configure python
6468
uses: actions/setup-python@v4

.github/workflows/nightly.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ concurrency:
3131

3232
jobs:
3333
deploy:
34-
runs-on: ubuntu-18.04
34+
runs-on: ubuntu-latest
3535
timeout-minutes: 10
36+
defaults:
37+
run:
38+
# use login shell for conda activation
39+
shell: bash -leo pipefail {0}
3640
steps:
3741
- name: configure python
3842
uses: actions/setup-python@v4

.github/workflows/test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ concurrency:
2525

2626
jobs:
2727
test:
28-
runs-on: ubuntu-18.04
28+
runs-on: ubuntu-latest
2929
timeout-minutes: 10
30+
defaults:
31+
run:
32+
# use login shell for conda activation
33+
shell: bash -leo pipefail {0}
3034
steps:
3135
- name: configure python
3236
uses: actions/setup-python@v4

.github/workflows/undeploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ on:
2525
workflow_dispatch:
2626
inputs:
2727
tag:
28-
description: 'Tag present on both cylc-flow and cylc-docs.'
28+
description: 'Tag present on both cylc-flow and cylc-doc'
2929
required: true
3030

3131
concurrency:
3232
group: ${{ github.workflow }}-${{ github.ref }}
3333

3434
jobs:
3535
undeploy:
36-
runs-on: ubuntu-18.04
36+
runs-on: ubuntu-latest
3737
timeout-minutes: 10
3838
env:
3939
TAG: ${{ github.event.inputs.tag }}

0 commit comments

Comments
 (0)