From 1bc3e87d3cb945342cf14ab8dc7af09de7a5a9d9 Mon Sep 17 00:00:00 2001 From: nbalne Date: Mon, 10 Nov 2025 09:10:49 +0000 Subject: [PATCH 1/2] chore: validate CI on release-ulmo (PROD-4445) --- .github/workflows/ci.yml | 3 +++ Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 789ba64aa3..73790c5504 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,9 @@ name: CI on: pull_request: + # branches: [ master, release-ulmo, feature/* ] + # push: + # branches: [ master, release-ulmo, feature/* ] jobs: pytest: 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 From c29ca161f81e03f063a8c8d35738870763b8281b Mon Sep 17 00:00:00 2001 From: nbalne Date: Mon, 10 Nov 2025 09:10:49 +0000 Subject: [PATCH 2/2] chore: validate CI on release-ulmo (PROD-4445) --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73790c5504..0fdb103ec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,10 +2,9 @@ name: CI on: pull_request: - # branches: [ master, release-ulmo, feature/* ] - # push: - # branches: [ master, release-ulmo, feature/* ] - + branches: [ release-ulmo, master, 'feature/*' ] + push: + branches: [ release-ulmo, master, 'feature/*' ] jobs: pytest: runs-on: ubuntu-22.04