From 95e69c01e8ceb9d532801129a8ccc44109b1250e Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 7 Jun 2024 14:40:29 +0100 Subject: [PATCH 1/4] Update the Alpine version in the CI. --- .github/workflows/ci-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-alpine.yml b/.github/workflows/ci-alpine.yml index d3e3209ac..a23e40898 100644 --- a/.github/workflows/ci-alpine.yml +++ b/.github/workflows/ci-alpine.yml @@ -7,7 +7,7 @@ on: jobs: build: if: "!contains(github.event.head_commit.message, '[skip alpine ci]')" - container: alpine:3.16 + container: alpine:3.20 runs-on: ubuntu-latest env: CXX: ${{ matrix.compiler }} From dbc2b4ce9f2d06f5a8e2e085a05d4b3d8de948d1 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 7 Jun 2024 14:40:41 +0100 Subject: [PATCH 2/4] Fix a conversion warning in win32service. --- win/win32service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/win32service.cpp b/win/win32service.cpp index b57127d17..caebf571f 100644 --- a/win/win32service.cpp +++ b/win/win32service.cpp @@ -266,7 +266,7 @@ int main(int argc, char* argv[]) SERVICE_TABLE_ENTRY serviceTable[] = { - { TEXT("InspIRCd"), (LPSERVICE_MAIN_FUNCTION)ServiceMain }, + { (LPSTR)"InspIRCd", (LPSERVICE_MAIN_FUNCTION)ServiceMain }, { nullptr, nullptr } }; From 756051eadae6e6136f265f921acbf657cfd10d1b Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 7 Jun 2024 15:03:11 +0100 Subject: [PATCH 3/4] Update irctest. --- .github/workflows/ci-irctest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-irctest.yml b/.github/workflows/ci-irctest.yml index 309df1af9..6eb512c1c 100644 --- a/.github/workflows/ci-irctest.yml +++ b/.github/workflows/ci-irctest.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v4 with: path: irctest - ref: 2dea91e17a873761f20bd10a9a188f6abe2046ba + ref: 330300eba13ba9fc8c40ae906642875cee5baf7b repository: progval/irctest - name: Run configure @@ -73,7 +73,7 @@ jobs: uses: actions/checkout@v4 with: path: irctest - ref: 2dea91e17a873761f20bd10a9a188f6abe2046ba + ref: 330300eba13ba9fc8c40ae906642875cee5baf7b repository: progval/irctest - name: Install irctest dependencies From e852518eff60cce84ca13c843ad0494e83462f6f Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 7 Jun 2024 17:37:41 +0100 Subject: [PATCH 4/4] Update irctest. --- .github/workflows/ci-irctest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-irctest.yml b/.github/workflows/ci-irctest.yml index 6eb512c1c..59f583e50 100644 --- a/.github/workflows/ci-irctest.yml +++ b/.github/workflows/ci-irctest.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v4 with: path: irctest - ref: 330300eba13ba9fc8c40ae906642875cee5baf7b + ref: af980ed3b639b5e1b3749c74027872adb69922a7 repository: progval/irctest - name: Run configure @@ -73,7 +73,7 @@ jobs: uses: actions/checkout@v4 with: path: irctest - ref: 330300eba13ba9fc8c40ae906642875cee5baf7b + ref: af980ed3b639b5e1b3749c74027872adb69922a7 repository: progval/irctest - name: Install irctest dependencies