Skip to content

Commit 94cb7b5

Browse files
hemagxhemagx
authored
Merge pull request #3410 from hemagx/update_ci
Fix CI builds, update it to match current support policy and fix several issues discovered by ci builds
2 parents b3bf8da + e4f032e commit 94cb7b5

28 files changed

Lines changed: 483 additions & 443 deletions

‎.appveyor.yml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
timeout-minutes: 30
1616
strategy:
1717
matrix:
18-
# gcc, clang-8, clang-9 removed for reduce number of jobs
19-
CC: ["gcc-12", "clang-13"]
18+
# Testing the oldest and newest supported version of gcc/clang on our supported platofrms
19+
CC: ["clang-15", "clang-19", "gcc-12", "gcc-14"]
2020
RENEWAL: [""]
2121
CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
2222
HTTPLIB: ["", "--with-http_parser=llhttp"]
@@ -36,7 +36,7 @@ jobs:
3636
cancel-in-progress: true
3737

3838
container:
39-
image: debian:bookworm
39+
image: ubuntu:24.04
4040
services:
4141
mariadb:
4242
image: mariadb:latest
@@ -58,7 +58,7 @@ jobs:
5858
CC: ${{ matrix.CC }}
5959
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
6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v6
6262
with:
6363
fetch-depth: 1
6464

.github/workflows/clang15_test.yml renamed to .github/workflows/clang_test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: clang15_test
1+
name: clang_test
22

33
on: workflow_call
44

@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 30
1616
strategy:
1717
matrix:
18-
CC: [clang-15]
18+
CC: [clang]
1919
RENEWAL: ["", "--disable-renewal"]
2020
CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
2121
HTTPLIB: ["", "--with-http_parser=llhttp"]
@@ -35,11 +35,11 @@ jobs:
3535
# github.head_ref will stop previous runs in the same PR (if in a PR)
3636
# github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
3737
concurrency:
38-
group: clang-15-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}
38+
group: clang_test-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}
3939
cancel-in-progress: true
4040

4141
container:
42-
image: debian:stable
42+
image: debian:unstable
4343
services:
4444
mariadb:
4545
image: mariadb:latest
@@ -62,7 +62,7 @@ jobs:
6262
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 }}
6363
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v6
6666
with:
6767
fetch-depth: 1
6868

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2727
with:
2828
# We must fetch at least the immediate parents so that if this is
2929
# a pull request then we can checkout the head.
3030
fetch-depth: 2
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@v3
34+
uses: github/codeql-action/init@v4
3535
with:
3636
languages: ${{ matrix.language }}
3737

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

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@v3
44+
uses: github/codeql-action/analyze@v4

‎.github/workflows/controller.yml‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,14 @@ jobs:
1919
needs: tools
2020
if: ${{ !failure() && !cancelled() }}
2121
uses: ./.github/workflows/build.yml
22-
clang15_test:
23-
needs: build
24-
if: ${{ !failure() && !cancelled() }}
25-
uses: ./.github/workflows/clang15_test.yml
26-
gcc_test:
27-
needs: build
28-
if: ${{ !failure() && !cancelled() }}
29-
uses: ./.github/workflows/gcc_test.yml
30-
gccold1:
31-
needs: build
32-
if: ${{ !failure() && !cancelled() }}
33-
uses: ./.github/workflows/gccold1.yml
34-
gccold2:
35-
needs: build
36-
if: ${{ !failure() && !cancelled() }}
37-
uses: ./.github/workflows/gccold2.yml
22+
# clang_test:
23+
# needs: build
24+
# if: ${{ !failure() && !cancelled() }}
25+
# uses: ./.github/workflows/clang_test.yml
26+
# gcc_test:
27+
# needs: build
28+
# if: ${{ !failure() && !cancelled() }}
29+
# uses: ./.github/workflows/gcc_test.yml
3830
gccsnapshot_test:
3931
needs: build
4032
if: ${{ !failure() && !cancelled() }}
@@ -43,19 +35,19 @@ jobs:
4335
needs: build
4436
if: ${{ !failure() && !cancelled() }}
4537
uses: ./.github/workflows/mariadb.yml
46-
mysql:
47-
needs: build
48-
if: ${{ !failure() && !cancelled() }}
49-
uses: ./.github/workflows/mysql.yml
50-
macos_latest:
51-
needs: build
52-
if: ${{ !failure() && !cancelled() }}
53-
uses: ./.github/workflows/macos_latest.yml
54-
macos_m1:
55-
needs: build
56-
if: ${{ !failure() && !cancelled() }}
57-
uses: ./.github/workflows/macos_m1.yml
58-
windows:
59-
needs: build
60-
if: ${{ !failure() && !cancelled() }}
61-
uses: ./.github/workflows/windows.yml
38+
# mysql:
39+
# needs: build
40+
# if: ${{ !failure() && !cancelled() }}
41+
# uses: ./.github/workflows/mysql.yml
42+
# macos_latest:
43+
# needs: build
44+
# if: ${{ !failure() && !cancelled() }}
45+
# uses: ./.github/workflows/macos_latest.yml
46+
# macos_m1:
47+
# needs: build
48+
# if: ${{ !failure() && !cancelled() }}
49+
# uses: ./.github/workflows/macos_m1.yml
50+
# windows:
51+
# needs: build
52+
# if: ${{ !failure() && !cancelled() }}
53+
# uses: ./.github/workflows/windows.yml

‎.github/workflows/gcc_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
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 }}
6363
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v6
6666
with:
6767
fetch-depth: 1
6868

‎.github/workflows/gccsnapshot_test.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
cancel-in-progress: true
4040

4141
container:
42-
image: debian:unstable
42+
image: ubuntu:24.04
4343
services:
4444
mariadb:
4545
image: mariadb:latest
@@ -62,7 +62,7 @@ jobs:
6262
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 }}
6363
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v6
6666
with:
6767
fetch-depth: 1
6868

@@ -101,12 +101,10 @@ jobs:
101101
- name: test
102102
run: |
103103
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
104-
export LD_PRELOAD=/usr/lib/gcc-snapshot/lib/libasan.so.8.0.0
105-
./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
104+
./tools/ci/travis.sh --sanitizer-build test ragnarok ragnarok ragnarok $SQLHOST
106105
107106
- name: extra test
108107
if: env.PACKET_VERSION != '--enable-packetver=20130724'
109108
run: |
110109
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
111-
export LD_PRELOAD=/usr/lib/gcc-snapshot/lib/libasan.so.8.0.0
112-
./tools/ci/travis.sh extratest
110+
./tools/ci/travis.sh --sanitizer-build extratest

‎.github/workflows/hwsapibot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ env:
1010

1111
jobs:
1212
hwsapi:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu:24.04
1414
concurrency:
1515
group: hwsapibot
1616
cancel-in-progress: true
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

2020
- name: info
2121
run: |

‎.github/workflows/macos_latest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
4646
CLASSIC_AUTOSPELL_LIST: ${{ matrix.CLASSIC_AUTOSPELL_LIST }}
4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v6
4949
with:
5050
fetch-depth: 1
5151

‎.github/workflows/macos_m1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
4646
CLASSIC_AUTOSPELL_LIST: ${{ matrix.CLASSIC_AUTOSPELL_LIST }}
4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v6
4949
with:
5050
fetch-depth: 1
5151

0 commit comments

Comments
 (0)