Skip to content

Commit

Permalink
Merge remote-tracking branch 'master' into rebalance
Browse files Browse the repository at this point in the history
  • Loading branch information
MishimaHaruna committed Aug 31, 2024
2 parents 7883a7d + 71fc107 commit 22e1480
Show file tree
Hide file tree
Showing 54 changed files with 594 additions and 406 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
# gcc, clang-8, clang-9 removed for reduce number of jobs
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
CC: ${{ matrix.CC }}
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang15_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [clang-15]
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 0 additions & 4 deletions .github/workflows/controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
needs: build
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/gccold2.yml
gccold3:
needs: build
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/gccold3.yml
gccsnapshot_test:
needs: build
if: ${{ !failure() && !cancelled() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gcc_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gccold1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: ["gcc-10", "gcc-9"]
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
CC: ${{ matrix.CC }}
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gccold2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: ["gcc-8", "gcc-7"]
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
CC: ${{ matrix.CC }}
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
87 changes: 0 additions & 87 deletions .github/workflows/gccold3.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/gccsnapshot_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hwsapibot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
group: hwsapibot
cancel-in-progress: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: info
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ env:
MYSQL_USER: 'ragnarok'
MYSQL_PASSWORD: 'ragnarok'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client mysql-connector-c
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client
SQLHOST: 'localhost'

jobs:
build:
runs-on: macos-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [clang]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos_m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ env:
MYSQL_USER: 'ragnarok'
MYSQL_PASSWORD: 'ragnarok'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client mysql-connector-c
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client
SQLHOST: 'localhost'

jobs:
build:
runs-on: macos-14
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [clang]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
container:
image: debian:unstable
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
build:
runs-on: windows-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [msbuild]
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ jmanfffreak <[email protected]>
joel <[email protected]>
Jônatas Andreta <[email protected]>
Jose Luis Rivera Flores <[email protected]>
jsn <[email protected]>
j-tkay <[email protected]>
KeiKun <[email protected]>
Kenpachi <[email protected]>
Expand Down
40 changes: 40 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,45 @@ All these changes only affect Renewal. Pre-renewal is unchanged.

- The `is_quest` argument to `pc->gainexp()` has been changed to a `flags` bitmask enum, in order to allow expansion to different flags. (#3279)

## [v2024.08] `August 2024`

### Added

### Changed

- Converted packets `CHARLOGIN_ONLINE_ACCOUNTS`, `MAPCHAR_AUTH_REQ`, `CHARLOGIN_SET_ACCOUNT_ONLINE` to the struct format. (#3304, #3312, #3314)
- Excluded the standalone (i.e. autotrader) characters from those sent to the API server. (#3314, issue #3306)
- Changed the `getpartymember()` script command to avoid the use of global temporary variables. (#3305, #3307, #3308, #3315)
- The caller now specifies an array that will be filled with the requested data.
- The amount of filled entries will be returned as the command's return value. The caller should only read up to that amount of entries from the array, as it may contain previous leftover values past that point.
- Added constants for specifying the requested data: `PT_MEMBER_NAME`, `PT_MEMBER_CHARID`, `PT_MEMBER_ACCID`.
- See the script_commands documentation for further details.
- The included scripts have been updated with the new syntax.
- Changed the `getguildmember()` script command to avoid the use of global temporary variables. (#3310, #3311, #3318)
- The caller now specifies an array that will be filled with the requested data.
- The amount of filled entries will be returned as the command's return value. The caller should only read up to that amount of entries from the array, as it may contain previous leftover values past that point.
- Added constants for specifying the requested data: `GD_MEMBER_NAME`, `GD_MEMBER_CHARID`, `GD_MEMBER_ACCID`.
- See the script_commands documentation for further details.
- Reduced timeout for the GitHub Actions CI builds to 30 minutes, to prevent stuck jobs from stalling the entire pipeline for too many hours. (#3317)

### Fixed

- Fixed a packet reading error causing the list of online characters on char and login server to desynchronize and invalidate the API server tokens. (#3304)
- Fixed CI builds failing due to the MariaDB client attempting to connect to the server with SSL. (#3313)
- Fixed the hwsapi commits failing because of an expired GPG key.
- Fixed HPMDataCheck containing incomplete data because of a missing include in the headers that use the `DEFINE_PACKET_ID` macro. (#3314)
- Updated the mapcache entry for `iz_ac02` (renewal-only content) to a 2012 version compatible with the included scripts. (#3316, issue #2809)
- Fixed deprecation warnings in the GitHub Actions CI builds caused by the use of unsupported nodejs v16 actions. The actions have been upgraded to their nodejs v20 versions as recommended by GitHub. (#3317)
- Fixed a deprecation warning in the GitHub Actions macOS CI builds due to a packet that was renamed. (#3317)

### Deprecated

- Deprecated building on GCC versions older than 7. This has been the case for at least 4 months according to the Supported Platforms rules, but this is the official deprecation warning. Support macros and workarounds will be dropped from the code at some point in the future. (#3317)

### Removed

- Removed GitHub Actions workflows that don't support nodejs v20. This includes the test builds for gcc-4.8, gcc-5 and gcc-6, which have been unsupported by Hercules for at least 4 months. (#3317)

## [v2024.06] `June 2024`

### Added
Expand Down Expand Up @@ -3891,6 +3930,7 @@ Note: everything included in this release is part of PR #3198 which consists of
- New versioning scheme and project changelogs/release notes (#1853)

[Unreleased]: https://github.com/HerculesWS/Hercules/compare/stable...master
[v2024.08]: https://github.com/HerculesWS/Hercules/compare/v2024.06...v2024.08
[v2024.06]: https://github.com/HerculesWS/Hercules/compare/v2024.05...v2024.06
[v2024.05]: https://github.com/HerculesWS/Hercules/compare/v2024.04...v2024.05
[v2024.04]: https://github.com/HerculesWS/Hercules/compare/v2024.03...v2024.04
Expand Down
Loading

0 comments on commit 22e1480

Please sign in to comment.