From d0f4faf91e8942a37a1b0fc28209d036c18f5aa8 Mon Sep 17 00:00:00 2001 From: Bizzonium Date: Mon, 24 Jul 2023 02:40:07 +0600 Subject: [PATCH 1/2] Fix: rust_g CI deps --- .github/workflows/ci_suite.yml | 8 ++++---- .github/workflows/conflicts.yml | 2 +- .github/workflows/docker_publish.yml | 2 +- .github/workflows/generate_documentation.yml | 2 +- .github/workflows/pr_emoji.yml | 2 +- .github/workflows/round_id_linker.yml | 2 +- .github/workflows/run_integration_tests.yml | 7 ++++--- .github/workflows/show_screenshot_test_results.yml | 2 +- .github/workflows/stale.yml | 2 +- .github/workflows/test_merge_bot.yml | 2 +- .github/workflows/update_tgs_dmapi.yml | 2 +- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 59e1c185c8eb66..94c7ae400dd535 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -80,7 +80,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]')" name: Compile Maps needs: [collect_data] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 concurrency: group: compile_all_maps-${{ github.ref }} cancel-in-progress: true @@ -105,7 +105,7 @@ jobs: collect_data: if: "!contains(github.event.head_commit.message, '[ci skip]')" name: Collect data for other tasks - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: maps: ${{ steps.map_finder.outputs.maps }} alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }} @@ -171,7 +171,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'" name: Check Alternate Tests needs: [run_alternate_tests] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: echo Alternate tests passed. @@ -179,7 +179,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]') && always()" needs: [run_all_tests, run_alternate_tests] name: Compare Screenshot Tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 # If we ever add more artifacts, this is going to break, but it'll be obvious. diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml index 9496bcf712770d..4009d5a05a1af0 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 48ef92c17f1557..2cd0f174b6dd82 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@v3 diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index 23ce6b1b5df456..19b0188d39cdb0 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -11,7 +11,7 @@ jobs: permissions: contents: write # for JamesIves/github-pages-deploy-action to push changes in repo if: "!contains(github.event.head_commit.message, '[ci skip]')" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 concurrency: gen-docs steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pr_emoji.yml b/.github/workflows/pr_emoji.yml index a9d35d2456fb13..a58e87fdb49a82 100644 --- a/.github/workflows/pr_emoji.yml +++ b/.github/workflows/pr_emoji.yml @@ -8,7 +8,7 @@ permissions: jobs: title_and_changelog: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: Wayland-Smithy/emoji-stripper-action@de0c1d158edee50700583d6454aa5f5117337599 with: diff --git a/.github/workflows/round_id_linker.yml b/.github/workflows/round_id_linker.yml index 5aede3503d1b80..fb4a202d179452 100644 --- a/.github/workflows/round_id_linker.yml +++ b/.github/workflows/round_id_linker.yml @@ -5,7 +5,7 @@ on: jobs: link_rounds: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: tgstation/round_linker@master with: diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 0c4ba61a8a45e1..6ec19e0469ca5c 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -18,7 +18,7 @@ on: type: string jobs: run_integration_tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 services: mysql: image: mysql:latest @@ -26,7 +26,7 @@ jobs: 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@v3 - name: Restore BYOND cache @@ -45,7 +45,8 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt update || true - sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386 + sudo apt install libgcc-s1:i386 + sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386 bash tools/ci/install_rust_g.sh - name: Install auxlua run: | diff --git a/.github/workflows/show_screenshot_test_results.yml b/.github/workflows/show_screenshot_test_results.yml index 61fc397477d34b..6e143c36b265c8 100644 --- a/.github/workflows/show_screenshot_test_results.yml +++ b/.github/workflows/show_screenshot_test_results.yml @@ -13,7 +13,7 @@ jobs: show_screenshot_test_results: if: "!contains(github.event.head_commit.message, '[ci skip]')" name: Show Screenshot Test Results - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: "Check for ARTIFACTS_FILE_HOUSE_KEY" id: secrets_set diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 26999ca629ba68..e7e41eebbab3a1 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -13,7 +13,7 @@ jobs: permissions: issues: write # for actions/stale to close stale issues pull-requests: write # for actions/stale to close stale PRs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/stale@v4 diff --git a/.github/workflows/test_merge_bot.yml b/.github/workflows/test_merge_bot.yml index ebf8928f435dfe..4eb62752c065cc 100644 --- a/.github/workflows/test_merge_bot.yml +++ b/.github/workflows/test_merge_bot.yml @@ -11,7 +11,7 @@ on: jobs: test_merge_bot: name: Test Merge Detector - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Check for GET_TEST_MERGES_URL id: secrets_set diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index fe4a917dcfd64d..aae81f7e0d87ae 100644 --- a/.github/workflows/update_tgs_dmapi.yml +++ b/.github/workflows/update_tgs_dmapi.yml @@ -7,7 +7,7 @@ on: jobs: update-dmapi: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: Update the TGS DMAPI steps: - name: Clone From 64ac2d14b864656e55adf4728e13a6f1f5a75907 Mon Sep 17 00:00:00 2001 From: Bizzonium Date: Mon, 24 Jul 2023 02:49:32 +0600 Subject: [PATCH 2/2] Fix: use MariaDB instead of Mysql --- .github/workflows/run_integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 6ec19e0469ca5c..1a7787e529844a 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 services: mysql: - image: mysql:latest + image: mariadb:latest env: MYSQL_ROOT_PASSWORD: root ports: