diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 789ba64aa3..0fdb103ec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,9 @@ name: CI on: pull_request: - + branches: [ release-ulmo, master, 'feature/*' ] + push: + branches: [ release-ulmo, master, 'feature/*' ] jobs: pytest: runs-on: ubuntu-22.04 diff --git a/Dockerfile b/Dockerfile index e1e391094f..f7bb8aa5a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal as app +FROM ubuntu:jammy as app ARG PYTHON_VERSION=3.12 @@ -93,7 +93,7 @@ RUN pip install -r ${DISCOVERY_CODE_DIR}/requirements/local.txt RUN DISCOVERY_CFG=minimal.yml OPENEDX_ATLAS_PULL=true make pull_translations -# Devstack related step for backwards compatibility +# Devstack related step for backwards compatibilityy RUN touch ${DISCOVERY_APP_DIR}/discovery_env CMD while true; do python ./manage.py runserver 0.0.0.0:8381; sleep 2; done