Merge pull request #3238 from guilherme-gm/ci-fixes

Fixes to itemlink and fixes/improvements to CI
HerculesWS · Oct 20, 2023 · 6715350 · 6715350
2 parents 811d1fd + a95cde5
commit 6715350
Show file tree

Hide file tree

Showing 37 changed files with 197 additions and 33 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -16,7 +16,7 @@ environment:
     HerculesProject: Hercules-16.sln
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     HerculesProject: Hercules-17.sln
-services: mysql56
+services: mysql
 build_script:
 - cmd: MSBuild %HerculesProject% /t:map-server,char-server,login-server
 test: off

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,8 +28,15 @@ jobs:
             CLIENT_TYPE: "--enable-packetver-zero"
           - CC: "clang-11"
             LTO: "--enable-lto"
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      cancel-in-progress: true
+
     container:
-      image: debian:unstable
+      image: debian:bookworm
     services:
       mariadb:
         image: mariadb:latest

diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml
@@ -24,6 +24,13 @@ jobs:
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}
+      cancel-in-progress: true
+
     container:
       image: debian:unstable
     services:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,6 +12,12 @@ jobs:
       matrix:
         language: ['c', 'python']
 
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.language }}
+      cancel-in-progress: true
+
     permissions:
       security-events: write
 

diff --git a/.github/workflows/gcc_test.yml b/.github/workflows/gcc_test.yml
@@ -24,6 +24,13 @@ jobs:
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}
+      cancel-in-progress: true
+
     container:
       image: debian:unstable
     services:

diff --git a/.github/workflows/gccold1.yml b/.github/workflows/gccold1.yml
@@ -25,6 +25,13 @@ jobs:
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      cancel-in-progress: true
+
     container:
       image: ubuntu:22.04
     services:

diff --git a/.github/workflows/gccold2.yml b/.github/workflows/gccold2.yml
@@ -25,6 +25,13 @@ jobs:
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      cancel-in-progress: true
+
     container:
       image: ubuntu:20.04
     services:

diff --git a/.github/workflows/gccold3.yml b/.github/workflows/gccold3.yml
@@ -26,6 +26,13 @@ jobs:
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      cancel-in-progress: true
+
     container:
       image: ubuntu:18.04
     services:

diff --git a/.github/workflows/gccsnapshot_test.yml b/.github/workflows/gccsnapshot_test.yml
@@ -24,6 +24,13 @@ jobs:
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}
+      cancel-in-progress: true
+
     container:
       image: debian:unstable
     services:

diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -22,6 +22,13 @@ jobs:
         SANITIZER: ["--disable-manager", "--enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024"]
         MYSQL: ["10.2", "latest"]
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.MYSQL }}
+      cancel-in-progress: true
+
     container:
       image: debian:unstable
     services:

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -22,6 +22,13 @@ jobs:
         SANITIZER: ["--disable-manager", "--enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024"]
         MYSQL: ["5.6", "5.7", "latest"]
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.MYSQL }}
+      cancel-in-progress: true
+
     container:
       image: debian:unstable
     services:

diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -12,6 +12,13 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+
+    # github.head_ref will stop previous runs in the same PR (if in a PR)
+    # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
+
     container:
       image: debian:unstable
     steps:

diff --git a/npc/dev/test.txt b/npc/dev/test.txt
@@ -243,19 +243,19 @@ function	script	F_TestGetItemLink_BaseWeapon	{
 }
 
 function	script	F_TestGetItemLink_FullWeapon	{
-	setarray(.@cards[0], Fabre_Card, Captain_Felock_Card, 0, Agility1);
+	setarray(.@cards[0], Fabre_Card, Necromancer_Card, 0, Agility1);
 	setarray(.@options[0], WEAPON_ATTR_GROUND, 1, 0, VAR_MAXHPAMOUNT, 10, 0);
 	.@str$ = getitemlink(Knife, 10, .@cards, .@options, 2);
 
 	.@pass = false;
 	if (PACKETVER < 20150923) {
 		.@pass = (.@str$ == getiteminfo(Knife, ITEMINFO_NAME));
 	} else if (PACKETVER < 20161116) {
-		.@pass = (.@str$ == "<ITEM>000021jn%0a'12y'74q'00'1ei)2R*00+01)01*00+0a</ITEM>");
+		.@pass = (.@str$ == "<ITEM>000021jn%0a'12y'19C'00'1ei)2R*00+01)01*00+0a</ITEM>");
 	} else if (PACKETVER < 20200916) {
-		.@pass = (.@str$ == "<ITEML>000021jn%0a&00(12y(74q(00(1ei*2R+00,01*01+00,0a</ITEML>");
+		.@pass = (.@str$ == "<ITEML>000021jn%0a&00(12y(19C(00(1ei*2R+00,01*01+00,0a</ITEML>");
 	} else {
-		.@pass = (.@str$ == "<ITEML>000021jn%0a&00'02)12y)74q)00)1ei+2R,00-01+01,00-0a</ITEML>");
+		.@pass = (.@str$ == "<ITEML>000021jn%0a&00'02)12y)19C)00)1ei+2R,00-01+01,00-0a</ITEML>");
 	}
 
 	return .@pass;

diff --git a/src/map/clif.c b/src/map/clif.c
@@ -25990,12 +25990,12 @@ static void clif_format_itemlink(StringBuf *buf, const struct item *it)
 #if PACKETVER >= 20161116
 	static const char view_sep = '&';
 #endif
-#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723
+#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 || PACKETVER_ZERO_NUM >= 20221024
 	static const char grade_sep = '\'';
 #endif
 
 	// Separators that were updated along the time
-#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723
+#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 || PACKETVER_ZERO_NUM >= 20221024
 	static const char *tag_name = "ITEML";
 	static const char card_sep = ')';
 	static const char optid_sep  = '+';
@@ -26040,7 +26040,7 @@ static void clif_format_itemlink(StringBuf *buf, const struct item *it)
 	StrBuf->Printf(buf, "%c%s", view_sep, get_padded_value(itd->view_sprite, 2));
 #endif // PACKETVER >= 20161116
 
-#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723
+#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 || PACKETVER_ZERO_NUM >= 20221024
 	StrBuf->Printf(buf, "%c%s", grade_sep, get_padded_value(it->grade, 2));
 #endif // PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723
 

diff --git a/src/test/test_chunked.c b/src/test/test_chunked.c
@@ -359,10 +359,12 @@ static void testChunkedBuf2(char *data, int sz)
 	fake_rflags = NULL;
 }
 
+#define MAX_TEST_BUFFER 10000
+
 static void testChunkedBuf(char *data, int sz)
 {
 	if (sz == 0)
-		sz = (int)strlen(data);
+		sz = (int) strnlen(data, MAX_TEST_BUFFER);
 	for (int f = 1; f < 30; f ++) {
 		fake_wchunk_size = f;
 		testChunkedBuf2(data, sz);
@@ -380,7 +382,7 @@ static void testChunked1(void)
 	testChunkedBuf("", 0);
 	show_success = false;
 	ShowStatus("Test long chunked\n");
-	for (int f = 0; f < 10000; f += 100) {
+	for (int f = 0; f < MAX_TEST_BUFFER; f += 100) {
 		// reallocate buffer always for detect overflow
 		char *buf = aCalloc(1, f);
 		for (int i = 0; i < f; i ++) {

diff --git a/vcproj-15/char-server.vcxproj b/vcproj-15/char-server.vcxproj
@@ -164,6 +164,7 @@
     <ClInclude Include="..\src\char\pincode.h" />
     <ClInclude Include="..\src\common\atomic.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
+    <ClInclude Include="..\src\common\base62.h" />
     <ClInclude Include="..\src\common\conf.h" />
     <ClInclude Include="..\src\common\console.h" />
     <ClInclude Include="..\src\common\core.h" />
@@ -231,6 +232,7 @@
     <ClCompile Include="..\src\char\loginif.c" />
     <ClCompile Include="..\src\char\mapif.c" />
     <ClCompile Include="..\src\char\pincode.c" />
+    <ClCompile Include="..\src\common\base62.c" />
     <ClCompile Include="..\src\common\conf.c" />
     <ClCompile Include="..\src\common\console.c" />
     <ClCompile Include="..\src\common\core.c" />
@@ -259,4 +261,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/vcproj-15/char-server.vcxproj.filters b/vcproj-15/char-server.vcxproj.filters
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <ClCompile Include="..\src\common\base62.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\conf.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -156,6 +159,9 @@
     <ClInclude Include="..\src\common\cbasetypes.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\base62.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -372,4 +378,4 @@
       <UniqueIdentifier>{d2dbc907-ce23-48c3-85ac-049ff2a8c728}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/vcproj-15/login-server.vcxproj b/vcproj-15/login-server.vcxproj
@@ -144,6 +144,7 @@
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
     <ClInclude Include="..\src\common\atomic.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
+    <ClInclude Include="..\src\common\base62.h" />
     <ClInclude Include="..\src\common\conf.h" />
     <ClInclude Include="..\src\common\console.h" />
     <ClInclude Include="..\src\common\core.h" />
@@ -196,6 +197,7 @@
     <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
     <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
+    <ClCompile Include="..\src\common\base62.c" />
     <ClCompile Include="..\src\common\conf.c" />
     <ClCompile Include="..\src\common\console.c" />
     <ClCompile Include="..\src\common\core.c" />
@@ -230,4 +232,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/vcproj-15/login-server.vcxproj.filters b/vcproj-15/login-server.vcxproj.filters
@@ -16,6 +16,9 @@
     <ClCompile Include="..\src\login\loginlog.c">
       <Filter>login</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\base62.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\conf.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -126,6 +129,9 @@
     <ClInclude Include="..\src\common\cbasetypes.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\base62.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -282,4 +288,4 @@
       <UniqueIdentifier>{d8fb6ac7-c87d-4d6b-aea4-98a0ea800666}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/vcproj-15/map-server.vcxproj b/vcproj-15/map-server.vcxproj
@@ -139,6 +139,7 @@
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
     <ClInclude Include="..\src\common\atomic.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
+    <ClInclude Include="..\src\common\base62.h" />
     <ClInclude Include="..\src\common\conf.h" />
     <ClInclude Include="..\src\common\console.h" />
     <ClInclude Include="..\src\common\core.h" />
@@ -248,6 +249,7 @@
     <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
     <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
+    <ClCompile Include="..\src\common\base62.c" />
     <ClCompile Include="..\src\common\conf.c" />
     <ClCompile Include="..\src\common\console.c" />
     <ClCompile Include="..\src\common\core.c" />
@@ -339,4 +341,4 @@
     <Copy SourceFiles="..\conf\import-tmpl\socket.conf" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\socket.conf')" />
     <Copy SourceFiles="..\conf\import-tmpl\script.conf" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\script.conf')" />
   </Target>
-</Project>
+</Project>
diff --git a/vcproj-15/map-server.vcxproj.filters b/vcproj-15/map-server.vcxproj.filters
@@ -193,6 +193,9 @@
     <ClCompile Include="..\src\common\utils.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\base62.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\conf.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -456,6 +459,9 @@
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\base62.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -570,4 +576,4 @@
       <UniqueIdentifier>{d7d16c66-c973-45d7-b47f-a1f80a898b9b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>