Revert "Test Build Version Bump"

This reverts commit 028a84e937.
Revert "Build: Install libcurl3"

This reverts commit c88a4f2e03.
Revert "Change libcurl3 to i386 version"

This reverts commit 7c41a35a94.
Revert "Build: change curl package"

This reverts commit 8b9a306fec.
Revert "Build: add another dependency"

This reverts commit 7dd81d1bd8.
Revert "Build: another package change"

This reverts commit 28dea1605a.
This commit is contained in:
Werner
2025-12-16 01:32:50 +01:00
parent 28dea1605a
commit ad09c3accc
4 changed files with 10 additions and 22 deletions
+6 -18
View File
@@ -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:
+1 -1
View File
@@ -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 "<instance_path>/Configuration/GameStaticFiles/"
static_files:
# Config directory should be static
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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