aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2020-04-02 11:48:09 +0200
committerDario Lombardo <lomato@gmail.com>2020-04-03 22:33:34 +0000
commitc474b70f8b45c094e03a07a21c28c13dad365c67 (patch)
treeef9a23e9c4478ca53d9e727083cb01f96874c8d6 /.github
parente285c7c1da6ead0de75ab11de4af0c13d0dea297 (diff)
github: move pip installations upwards.
python ssl has some conflict with installed packages. Installing pip stuff before other packages fixes it. Bug: 16478 Change-Id: Iba5a5eceb5e27a435544aa65e0fad683f798f3f3 Reviewed-on: https://code.wireshark.org/review/36669 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/macos.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 77a215b1ab..5f7ac530c5 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -13,14 +13,16 @@ jobs:
uses: actions/setup-python@v1
with:
python-version: 3.8
+ - name: Install dmgbuild
+ run: pip3 install dmgbuild
+ - name: Install pytest
+ run: pip install pytest pytest-xdist
- name: Set up Ruby 2.6
uses: actions/setup-ruby@v1.1.1
with:
ruby-version: '2.6'
- name: Install deps
run: ./tools/macos-setup-brew.sh
- - name: Install dmgbuild
- run: pip3 install dmgbuild
- name: Install asciidoctor
run: gem install asciidoctor
- name: Mkdir
@@ -34,8 +36,6 @@ jobs:
- name: Build test-programs
run: ninja test-programs
working-directory: build
- - name: Install pytest
- run: pip install pytest pytest-xdist
- name: Run tests
env:
PYTEST_ADDOPTS: --skip-missing-programs=rawshark