Skip to content

Fix CI by downgrading OS image #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reneSchm merged 4 commits into from
Dec 12, 2024
Merged

Fix CI by downgrading OS image #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c3ab42
replace CI image ubuntu-latest with ubuntu-22.04
reneSchm Dec 11, 2024
8361976
remove PyQt6 dependency
reneSchm Dec 11, 2024
641b8b9
readd PyQt6 and set version of its dependency
reneSchm Dec 11, 2024
cb1adc9
remove intolerable extra space from the end of a comment
reneSchm Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/epidata_main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

jobs:
pre-commit:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -29,7 +29,7 @@ jobs:
- uses: pre-commit/[email protected]

build-py-epidata:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: quay.io/pypa/manylinux_2_28_x86_64
steps:
- uses: actions/checkout@v4
Expand All @@ -39,7 +39,7 @@ jobs:

build-py-plot:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: quay.io/pypa/manylinux_2_28_x86_64
steps:
- uses: actions/checkout@v4
Expand All @@ -52,7 +52,7 @@ jobs:
strategy:
matrix:
version: ["3.8", "3.11"]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-py
Expand All @@ -67,7 +67,7 @@ jobs:
strategy:
matrix:
version: ["3.8", "3.11"]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-py
Expand All @@ -77,7 +77,7 @@ jobs:
coverage: ON

merge-artifacts:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
packages: [epidata, plot]
Expand All @@ -91,7 +91,7 @@ jobs:

test-pylint-epidata:
needs: build-py-epidata
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-pylint
Expand All @@ -100,7 +100,7 @@ jobs:

test-pylint-plot:
needs: build-py-plot
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-pylint
Expand All @@ -109,7 +109,7 @@ jobs:

download-data:
needs: build-py-epidata
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: true
steps:
- uses: actions/checkout@v4
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

jobs:
pre-commit:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -36,7 +36,7 @@ jobs:
version: ["latest", "min"]
include:
- version: "latest"
os: "ubuntu-latest"
os: "ubuntu-22.04"
- version: "min"
os: "ubuntu-20.04"
runs-on: ${{ matrix.os }}
Expand All @@ -52,7 +52,7 @@ jobs:

build-cpp-gcc-no-optional-deps:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/linux-build
Expand All @@ -64,7 +64,7 @@ jobs:

build-cpp-gcc-openmp:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/linux-build
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
version: ["latest", "min"]
include:
- version: "latest"
os: "ubuntu-latest"
os: "ubuntu-22.04"
- version: "min"
os: "ubuntu-20.04"
runs-on: ${{ matrix.os }}
Expand All @@ -127,7 +127,7 @@ jobs:

merge-test-artifacts:
needs: [test-cpp-gcc_clang, test-cpp-msvc, test-py-surrogatemodel]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: merge-coverage-artifacts
uses: actions/upload-artifact/merge@v4
Expand All @@ -153,7 +153,7 @@ jobs:
test-cpp-gcc-no-optional-deps:
if: github.event.pull_request.draft == false
needs: build-cpp-gcc-no-optional-deps
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/linux-test
Expand All @@ -164,7 +164,7 @@ jobs:
test-cpp-gcc-openmp:
if: github.event.pull_request.draft == false
needs: build-cpp-gcc-openmp
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 30
env:
OMP_NUM_THREADS: 4
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
version: ["latest", "min"]
include:
- version: "latest"
os: "ubuntu-latest"
os: "ubuntu-22.04"
- version: "min"
os: "ubuntu-20.04"
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:

build-py-generation:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: quay.io/pypa/manylinux_2_28_x86_64
steps:
- uses: actions/checkout@v4
Expand All @@ -257,7 +257,7 @@ jobs:

build-py-simulation:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: quay.io/pypa/manylinux_2_28_x86_64
steps:
- uses: actions/checkout@v4
Expand All @@ -267,7 +267,7 @@ jobs:

build-py-surrogatemodel:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: quay.io/pypa/manylinux_2_28_x86_64
steps:
- uses: actions/checkout@v4
Expand All @@ -281,7 +281,7 @@ jobs:
matrix:
version: ["3.8", "3.11"]
needs: build-py-generation
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-py
Expand All @@ -294,7 +294,7 @@ jobs:
strategy:
matrix:
version: ["3.8", "3.11"]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-py
Expand All @@ -307,7 +307,7 @@ jobs:
strategy:
matrix:
version: ["3.8", "3.11"]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-py
Expand All @@ -318,15 +318,15 @@ jobs:

test-docs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/test-docs

codecov:
if: github.event.pull_request.draft == false
needs: merge-test-artifacts
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Install dependencies
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:
permissions:
contents: write
needs: [test-docs, merge-test-artifacts]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions pycode/memilio-epidata/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ def run(self):
'pyxlsb',
'wget',
'twill==3.1',
# set PyQt6-sip version as the one pulled by PyQt6 in Epidata-CI (using manylinux_2_28_x86_64) req. python 3.9
'PyQt6-sip<13.9',
'PyQt6',
'python-calamine',
pymagic
Expand Down