Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes to itemlink and fixes/improvements to CI #3238

Merged
merged 7 commits into from
Oct 20, 2023
Merged

Fixes to itemlink and fixes/improvements to CI #3238

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
104519b
fix appveyor mysql service
guilherme-gm Oct 19, 2023
39bde24
fix clang-13 build action
guilherme-gm Oct 19, 2023
0fd5021
add concurrency setting for github actions workflows
guilherme-gm Oct 19, 2023
bdac982
fix itemlink formatting for zero 2022 clients
guilherme-gm Oct 19, 2023
601e52e
fix itemlink tests for pre-re
guilherme-gm Oct 19, 2023
fab1b83
fix a possible buffer overread in chunked test
guilherme-gm Oct 19, 2023
a95cde5
include base62.h/.c into VS projects
guilherme-gm Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/clang15_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/gcc_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/gccold1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/gccold2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/gccold3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/gccsnapshot_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/mariadb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions src/map/clif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25993,12 +25993,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
guilherme-gm marked this conversation as resolved.
Show resolved Hide resolved
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 = '+';
Expand Down Expand Up @@ -26043,7 +26043,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

Expand Down