Skip to content

Commit dbd2368

Browse files
fix: Changed test to use conda instead of an old docker container
1 parent 746d6b4 commit dbd2368

1 file changed

Lines changed: 48 additions & 37 deletions

File tree

.github/workflows/basic.yml

Lines changed: 48 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
timeout-minutes: 10
1111

1212
steps:
13-
- uses: actions/checkout@v3
14-
- name: Run shellcheck
15-
run: |
16-
find tests/CI -name '*.sh' -print0 | xargs -0 -n1 shellcheck --external-sources;
13+
- uses: actions/checkout@v3
14+
- name: Run shellcheck
15+
run: |
16+
find tests/CI -name '*.sh' -print0 | xargs -0 -n1 shellcheck --external-sources;
1717
1818
pycodestyle:
1919
runs-on: ubuntu-24.04
@@ -27,23 +27,26 @@ jobs:
2727
- 3.6.15
2828
- 3.9.17
2929

30-
container: python:${{ matrix.python }}-slim
3130
steps:
32-
- uses: actions/checkout@v3
33-
- name: Installing dependencies
34-
run: |
35-
python -m pip install pycodestyle
36-
- name: Run pycodestyle
37-
run: |
38-
if [[ "${REFERENCE_BRANCH}" != "" ]]; then
39-
git remote add upstream https://github.com/DIRACGrid/Pilot.git
40-
git fetch --no-tags upstream "${REFERENCE_BRANCH}"
41-
git branch -vv
42-
git diff -U0 "upstream/${REFERENCE_BRANCH}" | pycodestyle --diff
43-
fi
44-
env:
45-
REFERENCE_BRANCH: ${{ github['base_ref'] || github['head_ref'] }}
46-
31+
- uses: actions/checkout@v3
32+
- name: Set up Conda with Mamba
33+
uses: mamba-org/setup-miniconda@v2
34+
with:
35+
python-version: ${{ matrix.python }}
36+
auto-update-conda: true
37+
activate-environment: base
38+
- name: Installing dependencies
39+
run: conda install -y pycodestyle
40+
- name: Run pycodestyle
41+
run: |
42+
if [[ "${REFERENCE_BRANCH}" != "" ]]; then
43+
git remote add upstream https://github.com/DIRACGrid/Pilot.git
44+
git fetch --no-tags upstream "${REFERENCE_BRANCH}"
45+
git branch -vv
46+
git diff -U0 "upstream/${REFERENCE_BRANCH}" | pycodestyle --diff
47+
fi
48+
env:
49+
REFERENCE_BRANCH: ${{ github['base_ref'] || github['head_ref'] }}
4750

4851
pytest:
4952
runs-on: ubuntu-24.04
@@ -57,17 +60,21 @@ jobs:
5760
- 3.6.15
5861
- 3.9.17
5962

60-
container: python:${{ matrix.python }}-slim
6163
steps:
62-
- uses: actions/checkout@v3
63-
- name: Installing dependencies
64-
run: |
65-
python -m pip install pytest mock
66-
apt-get update
67-
apt install -y voms-clients
68-
- name: Run pytest
69-
run: pytest
70-
64+
- uses: actions/checkout@v3
65+
- name: Set up Conda with Mamba
66+
uses: mamba-org/setup-miniconda@v2
67+
with:
68+
python-version: ${{ matrix.python }}
69+
auto-update-conda: true
70+
activate-environment: base
71+
- name: Installing dependencies
72+
run: |
73+
conda install -y pytest mock
74+
sudo apt-get update
75+
sudo apt-get install -y voms-clients
76+
- name: Run pytest
77+
run: pytest
7178

7279
pylint:
7380
runs-on: ubuntu-24.04
@@ -81,11 +88,15 @@ jobs:
8188
- 3.6.15
8289
- 3.9.17
8390

84-
container: python:${{ matrix.python }}-slim
8591
steps:
86-
- uses: actions/checkout@v3
87-
- name: Installing dependencies
88-
run: |
89-
python -m pip install pylint
90-
- name: Run pylint
91-
run: pylint -E Pilot/
92+
- uses: actions/checkout@v3
93+
- name: Set up Conda with Mamba
94+
uses: mamba-org/setup-miniconda@v2
95+
with:
96+
python-version: ${{ matrix.python }}
97+
auto-update-conda: true
98+
activate-environment: base
99+
- name: Installing dependencies
100+
run: conda install -y pylint
101+
- name: Run pylint
102+
run: pylint -E Pilot/

0 commit comments

Comments
 (0)