Skip to content

Commit

Permalink
CI: setup-python first
Browse files Browse the repository at this point in the history
  • Loading branch information
MehdiChinoune committed Apr 26, 2024
1 parent 4abd0de commit aff306e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/linux-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ jobs:
submodules: true
fetch-depth: 0

# Python version used to build makhber must be the same for miniconda
- uses: actions/setup-python@v5
with:
python-version: '${{ env.PYTHON_VERSION }}'

- name: Restore cached Qt
id: cache-qt
uses: actions/cache@v4
Expand All @@ -135,11 +140,6 @@ jobs:
dir: ${{ github.workspace }}/Qt
archives: qtbase qtsvg qttools qttranslations

# Python version used to build makhber must be the same for miniconda
- uses: actions/setup-python@v5
with:
python-version: '${{ env.PYTHON_VERSION }}'

- name: Install prerequisties
run: |
sudo apt install -y --no-install-recommends \
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
with:
submodules: true

- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Restore cached Qt
id: cache-qt
uses: actions/cache@v4
Expand Down Expand Up @@ -91,10 +95,6 @@ jobs:
make -j$(nproc)
make install
- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Install Python packages
run: |
pip3 install sip pyqt-builder numpy
Expand Down Expand Up @@ -141,6 +141,10 @@ jobs:
with:
submodules: true

- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Restore cached Qt
id: cache-qt
uses: actions/cache@v4
Expand Down Expand Up @@ -197,10 +201,6 @@ jobs:
git pull origin master
vcpkg install zlib gsl muparser liborigin opengl gl2ps gtest pkgconf
- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Install Python packages
run: |
pip install sip pyqt-builder numpy
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ jobs:
with:
submodules: true

- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Restore cached Qt
id: cache-qt
uses: actions/cache@v4
Expand Down Expand Up @@ -113,10 +117,6 @@ jobs:
Add-Content $Env:VCPKG_INSTALLATION_ROOT\triplets\$Env:VCPKG_DEFAULT_TRIPLET.cmake "set(VCPKG_BUILD_TYPE release)"
vcpkg install zlib gsl muparser liborigin opengl gl2ps openssl pkgconf
- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Install Python packages
run: |
pip3 install sip pyqt-builder
Expand Down Expand Up @@ -341,6 +341,11 @@ jobs:
with:
submodules: true

# Python version used to build makhber must be the same for miniconda
- uses: actions/setup-python@v5
with:
python-version: '${{ env.PYTHON_VERSION }}'

- name: Restore cached Qt
id: cache-qt
uses: actions/cache@v4
Expand All @@ -356,11 +361,6 @@ jobs:
dir: ${{ github.workspace }}/Qt
archives: qtbase qtsvg qttools qttranslations icu

# Python version used to build makhber must be the same for miniconda
- uses: actions/setup-python@v5
with:
python-version: '${{ env.PYTHON_VERSION }}'

- name: Install prerequisties
run: |
sudo apt remove -y libgsl23 libgslcblas0
Expand Down

0 comments on commit aff306e

Please sign in to comment.