From 9ce3cfc8b33bf80e480536a348690a6610c02e91 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 9 Sep 2024 09:56:14 -0400 Subject: [PATCH 1/3] build: Switch to ubuntu-latest for builds This code does not have any dependencies that are specific to any specific version of ubuntu. So instead of testing on a specific version and then needing to do work to keep the versions up-to-date, we switch to the ubuntu-latest target which should be sufficient for testing purposes. This work is being done as a part of https://github.com/openedx/platform-roadmap/issues/377 closes https://github.com/openedx/edx-cookiecutters/issues/478 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 598173d5..e5cde27e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] python-version: - '3.12' toxenv: [py, quality] @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] python-version: - '3.12' steps: From e333a67114fd88587e8c99390769dc8ac38667e1 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 27 Sep 2024 10:15:10 -0400 Subject: [PATCH 2/3] build: bump the python version for make upgrade We're now building with 3.12 here so make sure `make upgrade` is run with python 3.12 --- .github/workflows/upgrade-python-requirements.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index b4cba02d..6ccd10ca 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -14,8 +14,9 @@ jobs: with: branch: ${{ github.event.inputs.branch }} team_reviewers: "arbi-bom" - email_address: arbi-bom@edx.org + email_address: arbi-bom@edx.org send_success_notification: false + python_version: "3.12" secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} From 0b3345a4cb1f988625e11dd4dcf826dbd787a4a6 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 27 Sep 2024 10:47:06 -0400 Subject: [PATCH 3/3] build: Update cookiecutter workflows to ubuntu-latest --- .../{{cookiecutter.repo_name}}/.github/workflows/ci.yml | 2 +- .../.github/workflows/check-reserved-keywords.yml | 2 +- .../{{cookiecutter.repo_name}}/.github/workflows/ci.yml | 2 +- .../.github/workflows/ci.yml | 2 +- .../.github/workflows/pypi-publish.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookiecutter-django-app/{{cookiecutter.repo_name}}/.github/workflows/ci.yml b/cookiecutter-django-app/{{cookiecutter.repo_name}}/.github/workflows/ci.yml index 2b19f6c3..0b0f4d05 100644 --- a/cookiecutter-django-app/{{cookiecutter.repo_name}}/.github/workflows/ci.yml +++ b/cookiecutter-django-app/{{cookiecutter.repo_name}}/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] python-version: ['3.8'] toxenv: [quality, docs, pii_check, django32, django40] diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/.github/workflows/check-reserved-keywords.yml b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/.github/workflows/check-reserved-keywords.yml index 7c535ade..ee6440a2 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/.github/workflows/check-reserved-keywords.yml +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/.github/workflows/check-reserved-keywords.yml @@ -6,7 +6,7 @@ on: jobs: check-reserved-keywords: name: Check Reserved Keywords - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/cookiecutter-xblock/{{cookiecutter.repo_name}}/.github/workflows/ci.yml b/cookiecutter-xblock/{{cookiecutter.repo_name}}/.github/workflows/ci.yml index 18cde08d..2bb499af 100644 --- a/cookiecutter-xblock/{{cookiecutter.repo_name}}/.github/workflows/ci.yml +++ b/cookiecutter-xblock/{{cookiecutter.repo_name}}/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] python-version: ['3.8'] toxenv: [quality, docs, django32, django40] diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/ci.yml b/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/ci.yml index 5d506484..02269f1a 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/ci.yml +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] python-version: ['3.8'] toxenv: ["py38", "quality", "docs", "pii_check"] diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/pypi-publish.yml b/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/pypi-publish.yml index 8b909b60..da353d45 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/pypi-publish.yml +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/.github/workflows/pypi-publish.yml @@ -7,7 +7,7 @@ on: jobs: push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout