From 317edccf59b615ada97749a5842f02b2252ce558 Mon Sep 17 00:00:00 2001 From: Aziz Chynaliev Date: Mon, 24 Jul 2023 03:08:24 +0600 Subject: [PATCH] Fix: rust_g CI deps and use MariaDB instead of Mysql (#23) * Fix: rust_g CI deps * Fix: use MariaDB instead of Mysql --- .github/workflows/conflicts.yml | 2 +- .github/workflows/docker_publish.yml | 2 +- .github/workflows/run_integration_tests.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml index 9496bcf712770db..4009d5a05a1af0e 100644 --- a/.github/workflows/conflicts.yml +++ b/.github/workflows/conflicts.yml @@ -11,7 +11,7 @@ jobs: permissions: contents: read pull-requests: write - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: eps1lon/actions-label-merge-conflict@v2.1.0 with: diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index daf078d2d4c5446..6e0fa5b69f8abc3 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -8,7 +8,7 @@ on: jobs: publish: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 42954b571b6ccbc..025ac310fe5575e 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -18,15 +18,15 @@ on: type: string jobs: run_integration_tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 services: mysql: - image: mysql:latest + image: mariadb:latest env: MYSQL_ROOT_PASSWORD: root ports: - 3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - uses: actions/checkout@v4 - name: Restore BYOND cache