Merge branch 'master' into dev

This commit is contained in:
tgstation-server-ci[bot]
2026-02-02 05:08:50 +00:00
2 changed files with 7 additions and 7 deletions
+5 -5
View File
@@ -204,7 +204,7 @@ jobs:
run: |
FULL_VERSION=${{ matrix.byond }}
if [[ "$FULL_VERSION" = "EDGE" ]] ; then
VERSIONS=$(curl https://spacestation13.github.io/byond-builds/version.txt)
VERSIONS=$(curl https://byond-builds.dm-lang.org/version.txt)
FULL_VERSION=$(echo "$VERSIONS" | tail -n1)
echo "EDGE version evaluated to $FULL_VERSION"
@@ -234,7 +234,7 @@ jobs:
mkdir -p $HOME/byond-zips-cache/linux/$FULL_VERSION
DOWNLOAD_URL="${{ env.DMAPI_BYOND_BUILD_MIRROR_DOWNLOAD_TEMPLATE }}"
if [[ "${{ matrix.byond }}" = "EDGE" ]] ; then
DOWNLOAD_URL="https://spacestation13.github.io/byond-builds/$BYOND_MAJOR/${FULL_VERSION}_byond_linux.zip"
DOWNLOAD_URL="https://byond-builds.dm-lang.org/$BYOND_MAJOR/${FULL_VERSION}_byond_linux.zip"
fi
curl "$DOWNLOAD_URL" -o $HOME/byond-zips-cache/linux/$FULL_VERSION/$FULL_VERSION.zip
fi
@@ -649,7 +649,7 @@ jobs:
- name: Evaluate BYOND version
id: version_evaluation
run: |
VERSIONS=$(curl https://spacestation13.github.io/byond-builds/version.txt)
VERSIONS=$(curl https://byond-builds.dm-lang.org/version.txt)
FULL_VERSION=$(echo "$VERSIONS" | tail -n1)
echo "EDGE version evaluated to $FULL_VERSION"
echo "EVALUATED_VERSION=$FULL_VERSION" >> $GITHUB_OUTPUT
@@ -661,12 +661,12 @@ jobs:
BYOND_MAJOR=${FULL_VERSION%.*}
if [[ ! -f $HOME/byond-zips-cache/live/linux/$FULL_VERSION/$FULL_VERSION.zip ]] ; then
mkdir -p $HOME/byond-zips-cache/live/linux/$FULL_VERSION
DOWNLOAD_URL="https://spacestation13.github.io/byond-builds/$BYOND_MAJOR/${FULL_VERSION}_byond_linux.zip"
DOWNLOAD_URL="https://byond-builds.dm-lang.org/$BYOND_MAJOR/${FULL_VERSION}_byond_linux.zip"
curl "$DOWNLOAD_URL" -o $HOME/byond-zips-cache/live/linux/$FULL_VERSION/$FULL_VERSION.zip
fi
if [[ ! -f $HOME/byond-zips-cache/live/windows/$FULL_VERSION/$FULL_VERSION.zip ]] ; then
mkdir -p $HOME/byond-zips-cache/live/windows/$FULL_VERSION
DOWNLOAD_URL="https://spacestation13.github.io/byond-builds/$BYOND_MAJOR/${FULL_VERSION}_byond.zip"
DOWNLOAD_URL="https://byond-builds.dm-lang.org/$BYOND_MAJOR/${FULL_VERSION}_byond.zip"
curl "$DOWNLOAD_URL" -o $HOME/byond-zips-cache/live/windows/$FULL_VERSION/$FULL_VERSION.zip
fi
+2 -2
View File
@@ -140,7 +140,7 @@ namespace Tgstation.Server.Tests
{
// always check byond.com first for latest up-to-date, mirror should ALWAYS have stable versions
// except byond hates all CI runners now
const string DefaultMirror = "https://spacestation13.github.io/byond-builds/version.txt";
const string DefaultMirror = "https://byond-builds.dm-lang.org/version.txt";
edgeVersion = await GetVersionFromResponse(DefaultMirror);
logger.LogInformation("Downloading edge version from SS13 mirror {edge}", edgeVersion);
@@ -151,7 +151,7 @@ namespace Tgstation.Server.Tests
Version.Parse(edgeVersion),
new PlatformIdentifier().IsWindows,
cancellationToken,
"https://spacestation13.github.io/byond-builds/${Major}/${Major}.${Minor}_byond${Linux:_linux}.zip");
"https://byond-builds.dm-lang.org/${Major}/${Major}.${Minor}_byond${Linux:_linux}.zip");
}
catch (Exception ex)
{