From e6b28e0b15ae8de3a73247c6a5754625445f3e96 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 27 Nov 2023 21:49:18 +0000 Subject: [PATCH] Fix: Hotfix 2023-11-23 hlds update (#169) Co-authored-by: joe --- .github/workflows/ci-master-pr.yml | 1 - build/Dockerfile | 8 ++++ test/build-hlds-cstrike.env | 4 +- test/hlds-valve | 61 ++++++++++++++++++++---------- test/update-hlds-cstrike.env | 2 +- update/Dockerfile | 7 ++++ 6 files changed, 58 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 87d29f90..675ef033 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -13,7 +13,6 @@ on: jobs: test-build-hlds: runs-on: ubuntu-latest - if: github.event_name != 'pull_request' || github.repository_owner != 'startersclan' steps: - uses: actions/checkout@v3 - name: Test build diff --git a/build/Dockerfile b/build/Dockerfile index 3e52838d..a11ea92b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -113,6 +113,14 @@ RUN echo "[BUILD] Applying game fixes"; \ # Create steam_appid.txt containing the game's appid to prevent crashes on first run echo "[BUILD] CLIENT_APPID: $CLIENT_APPID"; \ echo "$CLIENT_APPID" > "$SERVER_DIR/steam_appid.txt"; \ + # Create necessary symlinks for hlds + if [ "$APPID" = 90 ]; then \ + echo "[UPDATE] Applying hotfixes for hlds"; \ + # Hotfix "Error:./libstdc++.so.6: version CXXABI_1.3.8' not found" + ln -sfnv /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 /server/libgcc_s.so.1; \ + ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /server/libstdc++.so.6; \ + ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /steamcmd/linux32/libstdc++.so.6; \ + fi; \ # Create necessary symlinks for srcds/cs2 if [ "$APPID" = 730 ]; then \ mkdir -p /root/.steam/sdk64; \ diff --git a/test/build-hlds-cstrike.env b/test/build-hlds-cstrike.env index 31c35fc0..df91b77d 100644 --- a/test/build-hlds-cstrike.env +++ b/test/build-hlds-cstrike.env @@ -9,11 +9,11 @@ APPID=90 CLIENT_APPID=10 GAME=cstrike MOD=cstrike -FIX_APPMANIFEST=true +FIX_APPMANIFEST= INSTALL_COUNT= LATEST=true CACHE= NO_CACHE= NO_TEST= NO_PUSH=true -STEAM_LOGIN=true +STEAM_LOGIN= diff --git a/test/hlds-valve b/test/hlds-valve index 3e1d9684..a5ff710c 100644 --- a/test/hlds-valve +++ b/test/hlds-valve @@ -1,21 +1,40 @@ - -Console initialized. -Using breakpad crash handler -Setting breakpad minidump AppID = 70 -Forcing breakpad minidump interfaces to load -dlopen failed trying to load: -/root/.steam/sdk32/steamclient.so -with error: -/root/.steam/sdk32/steamclient.so: cannot open shared object file: No such file or directory -Looking up breakpad interfaces from steamclient -Calling BreakpadMiniDumpSystemInit -Protocol version 48 -Exe version 1.1.2.2/Stdio (valve) -Exe build: 17:23:32 May 24 2018 (7882) -STEAM Auth Server -Protocol version 48 -Exe version 1.1.2.2/Stdio (valve) -Exe build: 21:47:32 Aug 8 2018 (7882) -Server IP address 172.16.0.2:27015 -couldn't exec listip.cfg -couldn't exec banned.cfg + +Console initialized. +Using breakpad crash handler +Setting breakpad minidump AppID = 70 +Forcing breakpad minidump interfaces to load +dlopen failed trying to load: +/root/.steam/sdk32/steamclient.so +with error: +/root/.steam/sdk32/steamclient.so: cannot open shared object file: No such file or directory +Looking up breakpad interfaces from steamclient +Calling BreakpadMiniDumpSystemInit +Protocol version 48 +Exe version 1.1.2.2/Stdio (valve) +Exe build: 17:23:32 May 24 2018 (7882) +STEAM Auth Server + +Protocol version 48 +Exe version 1.1.2.2/Stdio (valve) +Exe build: 21:47:32 Aug 8 2018 (7882) +Server IP address 172.16.0.2:27015 +couldn't exec listip.cfg +couldn't exec banned.cfg + +Console initialized. +Using breakpad crash handler +Setting breakpad minidump AppID = 70 +Forcing breakpad minidump interfaces to load +dlopen failed trying to load: +/root/.steam/sdk32/steamclient.so +with error: +/root/.steam/sdk32/steamclient.so: cannot open shared object file: No such file or directory +Looking up breakpad interfaces from steamclient +Calling BreakpadMiniDumpSystemInit +Protocol version 48 +Exe version 1.1.2.2/Stdio (valve) +Exe build: 19:52:19 Aug 3 2020 (8684) +STEAM Auth Server +Server IP address 172.17.0.3:27015 +couldn't exec listip.cfg +couldn't exec banned.cfg diff --git a/test/update-hlds-cstrike.env b/test/update-hlds-cstrike.env index b118e863..b7d161dc 100644 --- a/test/update-hlds-cstrike.env +++ b/test/update-hlds-cstrike.env @@ -13,4 +13,4 @@ NO_PULL=true NO_CACHE= NO_TEST= NO_PUSH=true -STEAM_LOGIN=true +STEAM_LOGIN= diff --git a/update/Dockerfile b/update/Dockerfile index 44707d2e..df25da1e 100644 --- a/update/Dockerfile +++ b/update/Dockerfile @@ -42,6 +42,13 @@ RUN --mount=type=secret,id=STEAM_USERNAME \ ls -al "$SERVER_DIR/steamapps"; \ i=$(( i+1 )); \ done; \ + if [ "$APPID" = 90 ]; then \ + echo "[UPDATE] Applying hotfixes for hlds"; \ + # Hotfix "Error:./libstdc++.so.6: version CXXABI_1.3.8' not found" + ln -sfnv /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 /server/libgcc_s.so.1; \ + ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /server/libstdc++.so.6; \ + ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /steamcmd/linux32/libstdc++.so.6; \ + fi; \ echo "[UPDATE] Performing cleanup"; \ # Clean up a different set of files for srcds/cs2 if [ "$APPID" = 730 ]; then \