From d7f7d4a028b0d15f2979f4e84821af30a12b1e45 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Fri, 25 Apr 2025 16:00:41 +0100 Subject: [PATCH 1/2] Use latest Ubuntu image on CI --- .github/workflows/ci.yml | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7f72eb74..e5f48d437 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: jobs: test: name: Run test suite - runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-latest' when https://github.com/microsoft/mssql-docker/issues/899 resolved. + runs-on: ubuntu-latest env: COMPOSE_FILE: compose.ci.yaml @@ -34,26 +34,26 @@ jobs: - name: Run tests run: docker compose run ci - - standardrb: - name: Code linting and formatting - runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-latest' when https://github.com/microsoft/mssql-docker/issues/899 resolved. - - env: - COMPOSE_FILE: compose.ci.yaml - - strategy: - fail-fast: false - matrix: - ruby: - - 3.4.1 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Build docker images - run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }} - - - name: Run standardrb - run: docker compose run standardrb +# +# standardrb: +# name: Code linting and formatting +# runs-on: ubuntu-latest +# +# env: +# COMPOSE_FILE: compose.ci.yaml +# +# strategy: +# fail-fast: false +# matrix: +# ruby: +# - 3.4.1 +# +# steps: +# - name: Checkout code +# uses: actions/checkout@v2 +# +# - name: Build docker images +# run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }} +# +# - name: Run standardrb +# run: docker compose run standardrb From 3644dfd57e27a23274c550cca812dfd1f3447a1d Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Fri, 25 Apr 2025 19:06:50 +0100 Subject: [PATCH 2/2] Uncomment --- .github/workflows/ci.yml | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5f48d437..ee0b1428b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,26 +34,26 @@ jobs: - name: Run tests run: docker compose run ci -# -# standardrb: -# name: Code linting and formatting -# runs-on: ubuntu-latest -# -# env: -# COMPOSE_FILE: compose.ci.yaml -# -# strategy: -# fail-fast: false -# matrix: -# ruby: -# - 3.4.1 -# -# steps: -# - name: Checkout code -# uses: actions/checkout@v2 -# -# - name: Build docker images -# run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }} -# -# - name: Run standardrb -# run: docker compose run standardrb + + standardrb: + name: Code linting and formatting + runs-on: ubuntu-latest + + env: + COMPOSE_FILE: compose.ci.yaml + + strategy: + fail-fast: false + matrix: + ruby: + - 3.4.1 + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Build docker images + run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }} + + - name: Run standardrb + run: docker compose run standardrb