Skip to content

Commit

Permalink
Merge pull request #400 from openedx/ubuntu-latest
Browse files Browse the repository at this point in the history
Upgrade ci to ubuntu-latest
  • Loading branch information
Feanil Patel authored Sep 10, 2024
2 parents 4b558f3 + e4af8b4 commit 372eca9
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- '**'
jobs:
run_tests:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.11', '3.12']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
jobs:
push:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
if: github.event_name == 'push'

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:

push:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:noble
FROM ubuntu:latest

RUN apt-get update && apt-get install -y \
gettext \
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ packaging==24.1
# via
# pyproject-api
# tox
platformdirs==4.3.1
platformdirs==4.3.2
# via
# tox
# virtualenv
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ packaging==24.1
# tox
pbr==6.1.0
# via stevedore
platformdirs==4.3.1
platformdirs==4.3.2
# via
# -r requirements/test.txt
# pylint
Expand Down
2 changes: 1 addition & 1 deletion requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ packaging==24.1
# tox
pbr==6.1.0
# via stevedore
platformdirs==4.3.1
platformdirs==4.3.2
# via
# -r requirements/test.txt
# pylint
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ packaging==24.1
# pytest
# pytest-rerunfailures
# tox
platformdirs==4.3.1
platformdirs==4.3.2
# via
# tox
# virtualenv
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ addopts = --cov workbench --cov sample_xblocks --cov-report term-missing --cov-r
norecursedirs = .* doc bin prototype screenshots requirements

[testenv]
allowlist_externals =
allowlist_externals =
make
deps =
django42: Django>=4.2,<4.3
django42: Django>=4.2,<5.0
-r{toxinidir}/requirements/test.txt
passenv =
passenv =
DISPLAY
commands =
commands =
make var/workbench.db
python -Wd -m pytest {posargs}

[testenv:quality]
deps =
deps =
-r{toxinidir}/requirements/quality.txt
commands =
commands =
pylint workbench sample_xblocks
isort --check-only workbench sample_xblocks

0 comments on commit 372eca9

Please sign in to comment.