Skip to content

Commit 23142f3

Browse files
committed
GCC setup latest test
1 parent fc9bac9 commit 23142f3

File tree

2 files changed

+31
-9
lines changed

2 files changed

+31
-9
lines changed

.github/workflows/of.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ jobs:
337337
cfg:
338338
# - {target: linux, arch: 64, gcc: 6}
339339
- {target: linux, arch: 64, gcc: 14}
340-
- {target: linux, arch: 64, gcc: 10}
340+
# - {target: linux, arch: 64, gcc: 10}
341341
env:
342342
TARGET: ${{matrix.cfg.target}}
343343
GCC: ${{matrix.cfg.gcc}}
@@ -363,8 +363,19 @@ jobs:
363363
- name: Install dependencies
364364
run: ./scripts/ci/$TARGET/$ARCH/install.sh;
365365

366+
- name: Check GCC pre
367+
shell: bash
368+
run: gcc -v
369+
370+
- name: Setup GCC14
371+
run: ./scripts/linux/setupGCC.sh
372+
373+
- name: Check GCC post
374+
shell: bash
375+
run: gcc -v
376+
366377
- name: Download libs
367-
run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} -g ${{matrix.cfg.GCC}}
378+
run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} # -g ${{matrix.cfg.GCC}}
368379

369380
- name: Build
370381
run: |
@@ -406,8 +417,19 @@ jobs:
406417
- name: Install dependencies
407418
run: ./scripts/ci/$TARGET/$ARCH/install.sh;
408419

420+
- name: Check GCC pre
421+
shell: bash
422+
run: gcc -v
423+
424+
- name: Setup GCC14
425+
run: ./scripts/linux/setupGCC.sh
426+
427+
- name: Check GCC post
428+
shell: bash
429+
run: gcc -v
430+
409431
- name: Download libs
410-
run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} -g ${{matrix.cfg.GCC}}
432+
run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} #-g ${{matrix.cfg.GCC}}
411433

412434
- name: Build
413435
run: |

scripts/dev/download_libs.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ fi
197197

198198
if [ "$PLATFORM" == "linux" ]; then
199199
if [ "$GCC_VERSION" == 0 ]; then
200-
if command -v gcc &> /dev/null; then
201-
GCC_VERSION=$(gcc -dumpversion | cut -f1 -d.)
202-
echo "GCC_VERSION from bash: [$GCC_VERSION]"
203-
else
204-
GCC_VERSION=6
205-
fi
200+
# if command -v gcc &> /dev/null; then
201+
# GCC_VERSION=$(gcc -dumpversion | cut -f1 -d.)
202+
# echo "GCC_VERSION from bash: [$GCC_VERSION]"
203+
# else
204+
# GCC_VERSION=6
205+
# fi
206206
if [ "$GCC_VERSION" -gt 14 ]; then
207207
echo "GCC version is greater than 14. latest supported"
208208
GCC_VERSION=14

0 commit comments

Comments
 (0)