From ad09c3accc916cc89deceb4e0f77edb3715f214e Mon Sep 17 00:00:00 2001 From: Werner Date: Tue, 16 Dec 2025 01:32:38 +0100 Subject: [PATCH] Revert "Test Build Version Bump" This reverts commit 028a84e9374f65bef1917a45ade028d7108354a8. Revert "Build: Install libcurl3" This reverts commit c88a4f2e03b8ef117272ea829a9297dbe43af6af. Revert "Change libcurl3 to i386 version" This reverts commit 7c41a35a94f0b9ea0aea7a35c1dfae11cd80d090. Revert "Build: change curl package" This reverts commit 8b9a306fecdfcef0102e606e1907861cf056b19f. Revert "Build: add another dependency" This reverts commit 7dd81d1bd8a8071473252f3732e56ef0fe48ef98. Revert "Build: another package change" This reverts commit 28dea1605a8f3e4c4b329825ff5f0d7a8f6fae66. --- .github/workflows/byond.yml | 24 ++++++------------------ .tgs.yml | 2 +- dependencies.sh | 4 ++-- tools/ci/install_byond.sh | 2 +- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml index fd1debea980..c4659c0bd70 100644 --- a/.github/workflows/byond.yml +++ b/.github/workflows/byond.yml @@ -375,7 +375,7 @@ jobs: - name: Install OS Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 libcurl4-openssl-dev:i386 libcurl4t64:i386 libcurl4 + packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 version: 1.1 #And natively, the packages that break from a cache @@ -401,8 +401,6 @@ jobs: bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup bash tools/ci/install_rust_g.sh - env: - AURORA_BUILDASSETS_AUTH: ${{ secrets.AURORA_BUILDASSETS_AUTH }} # Get pull auth from github secrets - name: Configure pod, build and run env: @@ -500,7 +498,7 @@ jobs: - name: Install OS Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 libcurl4-openssl-dev:i386 libcurl4t64:i386 libcurl4 + packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 version: 1.1 #And natively, the packages that break from a cache @@ -526,8 +524,6 @@ jobs: bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup bash tools/ci/install_rust_g.sh - env: - AURORA_BUILDASSETS_AUTH: ${{ secrets.AURORA_BUILDASSETS_AUTH }} # Get pull auth from github secrets - name: Configure pod, build and run env: @@ -627,7 +623,7 @@ jobs: - name: Install OS Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 libcurl4-openssl-dev:i386 libcurl4t64:i386 libcurl4 + packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 version: 1.1 #And natively, the packages that break from a cache @@ -653,8 +649,6 @@ jobs: bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup bash tools/ci/install_rust_g.sh - env: - AURORA_BUILDASSETS_AUTH: ${{ secrets.AURORA_BUILDASSETS_AUTH }} # Get pull auth from github secrets - name: Configure pod, build and run env: @@ -754,7 +748,7 @@ jobs: - name: Install OS Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 libcurl4-openssl-dev:i386 libcurl4t64:i386 libcurl4 + packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 version: 1.1 #And natively, the packages that break from a cache @@ -780,8 +774,6 @@ jobs: bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup bash tools/ci/install_rust_g.sh - env: - AURORA_BUILDASSETS_AUTH: ${{ secrets.AURORA_BUILDASSETS_AUTH }} # Get pull auth from github secrets - name: Configure pod, build and run env: @@ -880,7 +872,7 @@ jobs: - name: Install OS Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 libcurl4-openssl-dev:i386 libcurl4t64:i386 libcurl4 + packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 version: 1.1 #And natively, the packages that break from a cache @@ -906,8 +898,6 @@ jobs: bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup bash tools/ci/install_rust_g.sh - env: - AURORA_BUILDASSETS_AUTH: ${{ secrets.AURORA_BUILDASSETS_AUTH }} # Get pull auth from github secrets - name: Configure pod, build and run env: @@ -1005,7 +995,7 @@ jobs: - name: Install OS Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 libcurl4-openssl-dev:i386 libcurl4t64:i386 libcurl4 + packages: gcc-multilib zlib1g-dev:i386 libssl-dev:i386 libgcc-s1:i386 libc6:i386 version: 1.1 #And natively, the packages that break from a cache @@ -1031,8 +1021,6 @@ jobs: bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup bash tools/ci/install_rust_g.sh - env: - AURORA_BUILDASSETS_AUTH: ${{ secrets.AURORA_BUILDASSETS_AUTH }} # Get pull auth from github secrets - name: Configure pod, build and run env: diff --git a/.tgs.yml b/.tgs.yml index 57d18557e3f..f820ba856fa 100644 --- a/.tgs.yml +++ b/.tgs.yml @@ -3,7 +3,7 @@ version: 1 # The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job) # Must be interpreted as a string, keep quoted -byond: "516.1673" +byond: "515.1644" # Folders to create in "/Configuration/GameStaticFiles/" static_files: # Config directory should be static diff --git a/dependencies.sh b/dependencies.sh index fda1d891035..21836b2bedc 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -2,9 +2,9 @@ if [ -z ${GITHUB_ENV+x} ]; then GITHUB_ENV=/dev/null; fi -export BYOND_MAJOR=516 +export BYOND_MAJOR=515 echo "BYOND_MAJOR=$BYOND_MAJOR" >> "$GITHUB_ENV" -export BYOND_MINOR=1673 +export BYOND_MINOR=1644 echo "BYOND_MINOR=$BYOND_MINOR" >> "$GITHUB_ENV" export RUST_G_VERSION=v3.1.0+a1 diff --git a/tools/ci/install_byond.sh b/tools/ci/install_byond.sh index 859d991fcf3..9108bde5ebe 100644 --- a/tools/ci/install_byond.sh +++ b/tools/ci/install_byond.sh @@ -14,7 +14,7 @@ else rm -rf "$HOME/BYOND" mkdir -p "$HOME/BYOND" cd "$HOME/BYOND" - curl "https://buildassets.aurorastation.org/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip -H "Authorization: Basic $AURORA_BUILDASSETS_AUTH" + curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip unzip byond.zip rm byond.zip cd byond