Skip to content

Commit 0d3d3b5

Browse files
committed
Change gcc-snapshot CI build to just current gcc and make it the main sanitizer build as conan doesn't support preview releases
Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
1 parent 4c778b7 commit 0d3d3b5

3 files changed

Lines changed: 5 additions & 18 deletions

File tree

.github/workflows/controller.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
# needs: build
2828
# if: ${{ !failure() && !cancelled() }}
2929
# uses: ./.github/workflows/gcc_test.yml
30-
gccsnapshot_test:
30+
sanitizer:
3131
needs: build
3232
if: ${{ !failure() && !cancelled() }}
33-
uses: ./.github/workflows/gccsnapshot_test.yml
33+
uses: ./.github/workflows/sanitizer.yml
3434
mariadb:
3535
needs: build
3636
if: ${{ !failure() && !cancelled() }}
Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
MYSQL_USER: 'ragnarok'
88
MYSQL_PASSWORD: 'ragnarok'
99
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
10-
DEBIAN_COMMON_PACKAGES: cmake make git python3 python3-venv libzstd-dev g++ gcc-snapshot
10+
DEBIAN_COMMON_PACKAGES: cmake make git python3 python3-venv libzstd-dev g++
1111

1212
defaults:
1313
run:
@@ -43,7 +43,7 @@ jobs:
4343
cancel-in-progress: true
4444

4545
container:
46-
image: ubuntu:26.04
46+
image: ubuntu:24.04
4747
services:
4848
mariadb:
4949
image: mariadb:latest
@@ -79,38 +79,25 @@ jobs:
7979
./tools/ci/retry.sh apt-get update
8080
./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES
8181
82-
- name: gcc version
83-
run: |
84-
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
85-
gcc --version
86-
ls -la /usr/lib/x86_64-linux-gnu/libasan.* || true
87-
ls -la /usr/lib/gcc-snapshot/lib/libasan.* || true
88-
ls -la /usr/lib/gcc-snapshot/lib/libasan.so.8.0.0
89-
9082
- name: init database
9183
run: |
92-
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
9384
./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST
9485
9586
- name: get plugins
9687
run: |
97-
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
9888
./tools/ci/travis.sh getplugins || true
9989
10090
- name: build
10191
run: |
102-
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
10392
./tools/ci/travis.sh prepareenv
10493
source .venv/bin/activate
10594
./tools/ci/travis.sh build $CONFIGURE_FLAGS
10695
10796
- name: test
10897
run: |
109-
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
11098
./tools/ci/travis.sh --sanitizer-build test ragnarok ragnarok ragnarok $SQLHOST
11199
112100
- name: extra test
113101
if: env.PACKET_VERSION != '-DPACKETVER=20130724'
114102
run: |
115-
export PATH=/usr/lib/gcc-snapshot/bin:$PATH
116103
./tools/ci/travis.sh --sanitizer-build extratest

tools/ci/travis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function run_server {
5858
rm -rf core* || true
5959
BACKUP_LD_PRELOAD="$LD_PRELOAD"
6060
if [ $SANITIZER_BUILD -eq 1 ]; then
61-
export LD_PRELOAD=/usr/lib/gcc-snapshot/lib/libasan.so.8.0.0
61+
export LD_PRELOAD=/usr/lib/gcc/x86_64-linux-gnu/15/libasan.so
6262
fi
6363
CRASH_PLEASE=1 $1 --run-once $2 2>runlog.txt
6464
LD_PRELOAD="$BACKUP_LD_PRELOAD"

0 commit comments

Comments
 (0)