From 671b5f9e1eb0fc67f0150d11ff120814d4f8bd95 Mon Sep 17 00:00:00 2001
From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Date: Fri, 1 Sep 2023 20:03:16 +0200
Subject: [PATCH] Update CI Flyway, update CI rustg, pin CI MariaDB (#17088)

* bkn

* sdfcfd

* test

* sdfas

* fear

* sdaf

* sdafsda

* sfda

* sdfasdfsa

* sdfasd

* sadfsad

* sdfa

* sadf

* sadf

* dear lord...

* 416

* if it's this i'm gonna laugh so hard

* sdfbk

* rrrrrrreverrrrrrrrt

* cl
---
 .github/workflows/byond.yml               |  8 ++---
 dependencies.sh                           |  4 +--
 html/changelogs/FluffyGhost-ci_flyway.yml | 43 +++++++++++++++++++++++
 3 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/FluffyGhost-ci_flyway.yml

diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml
index 81e6ac9be70..38d4c627a62 100644
--- a/.github/workflows/byond.yml
+++ b/.github/workflows/byond.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/SpacemanDMM
-          key: ${{ runner.os }}-spacemandmm
+          key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
       - name: Restore OpenDream cache
         uses: actions/cache@v3
         with:
@@ -130,7 +130,7 @@ jobs:
     needs: lint
     services:
       mariadb:
-        image: mariadb:latest
+        image: mariadb:10.4
         ports:
           - 3306
         env:
@@ -152,7 +152,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/flyway
-          key: ${{ runner.os }}-flyway
+          key: ${{ runner.os }}-flyway-${{ env.FLYWAY_BUILD }}
       - name: Prepare OS Environtment
         run: |
           sudo dpkg --add-architecture i386
@@ -161,7 +161,7 @@ jobs:
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386
-          version: 1.0
+          version: 1.1
       - name: Install OS Packages (Native)
         run: |
           sudo apt-get install libgcc-s1:i386 libssl-dev:i386
diff --git a/dependencies.sh b/dependencies.sh
index 210ff2720c0..6831bb44665 100755
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -7,9 +7,9 @@ echo "BYOND_MAJOR=$BYOND_MAJOR" >> "$GITHUB_ENV"
 export BYOND_MINOR=1613
 echo "BYOND_MINOR=$BYOND_MINOR" >> "$GITHUB_ENV"
 
-export RUST_G_VERSION=v1.2.0+a4
+export RUST_G_VERSION=v1.2.0+a5
 echo "RUST_G_VERSION=$RUST_G_VERSION" >> "$GITHUB_ENV"
-export FLYWAY_BUILD=9.20.1
+export FLYWAY_BUILD=9.21.1
 echo "FLYWAY_BUILD=$FLYWAY_BUILD" >> "$GITHUB_ENV"
 export SPACEMAN_DMM_VERSION=suite-1.7.3
 echo "SPACEMAN_DMM_VERSION=$SPACEMAN_DMM_VERSION" >> "$GITHUB_ENV"
diff --git a/html/changelogs/FluffyGhost-ci_flyway.yml b/html/changelogs/FluffyGhost-ci_flyway.yml
new file mode 100644
index 00000000000..1ce27f9dea6
--- /dev/null
+++ b/html/changelogs/FluffyGhost-ci_flyway.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - backend: "Updated CI Flyway to 9.21.1."
+  - backend: "Fixed CI MariaDB to 10.4, the version we use in prod."
+  - backend: "Updated CI rust_g to 1.2.0+a5."