From d16418ede100c5b3bc5f47a5425941f5e6673776 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 9 Sep 2024 10:07:48 -0400 Subject: [PATCH 1/2] 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/xqueue/issues/945 --- .github/workflows/ci.yml | 2 +- .github/workflows/mysql8-migrations-check.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15839a27..303b044c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: diff --git a/.github/workflows/mysql8-migrations-check.yml b/.github/workflows/mysql8-migrations-check.yml index 1adaed61..2414e0db 100644 --- a/.github/workflows/mysql8-migrations-check.yml +++ b/.github/workflows/mysql8-migrations-check.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-latest ] python-version: [ '3.8', '3.12' ] steps: From 60b7b0a799947cac11aef4516fca35c074083154 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 10 Sep 2024 11:12:51 -0400 Subject: [PATCH 2/2] build: Update the way we startup from compose files. `compose` is now a sub command of `docker` and not a separate utility. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 303b044c..fda01127 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - name: Start container run: | - docker-compose -f .github/docker-compose-ci.yml up -d + docker compose -f .github/docker-compose-ci.yml up -d - name: setup python if: ${{ matrix.python-version == 'py312' }}