zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-10 06:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Travis CI (#658)

Browse source 
* update to Ubuntu Focal
* use clang10
* avoid unintentional fallbacks to  default `/usr/bin/c++` compiler
* fix related compiler warnings
This commit is contained in:
Tom M 2020-07-28 21:05:01 +02:00 committed by GitHub
parent 3c94f6366d
commit 31c4e12ac9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
.travis.yml
View file

@ -1,15 +1,16 @@
language: c language: c
sudo: false sudo: false
os: linux os: linux
dist: bionic dist: focal
addons: addons:
apt: apt:
update: true update: true
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-bionic-7 - llvm-toolchain-focal-7
- llvm-toolchain-bionic-8 - llvm-toolchain-focal-8
- llvm-toolchain-bionic-9 - llvm-toolchain-focal-9
- llvm-toolchain-focal-10
packages: packages:
- cmake-data - cmake-data
- cmake - cmake
@ -38,31 +39,47 @@ matrix:
include: include:
- arch: arm64 - arch: arm64
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && sudo apt-get install gcc-7" - CC="gcc-7"
- CXX="g++-7"
- MATRIX_EVAL="sudo apt-get install gcc-7 g++-7"
- env: - env:
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8 && sudo apt-get install gcc-8" - CC="gcc-8"
- CXX="g++-8"
- MATRIX_EVAL="sudo apt-get install gcc-8 g++-8"
- CMAKE_FLAGS="-Denable-debug=1 -DCMAKE_C_FLAGS_DEBUG=-fuse-ld=gold" - CMAKE_FLAGS="-Denable-debug=1 -DCMAKE_C_FLAGS_DEBUG=-fuse-ld=gold"
- env: - env:
- MATRIX_EVAL="CC=clang-7 && CXX=clang++-7 && sudo apt-get install clang-7" - CC="clang-7"
- CXX="clang++-7"
- MATRIX_EVAL="sudo apt-get install clang-7"
- env: - env:
- MATRIX_EVAL="CC=clang-8 && CXX=clang++-8 && sudo rm -f /usr/local/clang-7.0.0/bin/clang-tidy && sudo ln -s /usr/bin/clang-tidy-8 /usr/bin/clang-tidy && sudo apt-get install clang-8 clang-tidy-8" - CC="clang-8"
- CXX="clang++-8"
- MATRIX_EVAL="sudo rm -f /usr/local/clang-7.0.0/bin/clang-tidy && sudo ln -s /usr/bin/clang-tidy-8 /usr/bin/clang-tidy && sudo apt-get install clang-8 clang-tidy-8"
- CMAKE_FLAGS="-Denable-profiling=1 -DCMAKE_C_FLAGS_DEBUG=-fuse-ld=gold" - CMAKE_FLAGS="-Denable-profiling=1 -DCMAKE_C_FLAGS_DEBUG=-fuse-ld=gold"
- env: - env:
- MATRIX_EVAL="CC=clang-9 && CXX=clang++-9 && sudo apt-get install clang-9" - CC="clang-9"
- CXX="clang++-9"
- MATRIX_EVAL="sudo apt-get install clang-9"
- env:
- CC="clang-10"
- CXX="clang++-10"
- MATRIX_EVAL="sudo apt-get install clang-10"
- os: linux-ppc64le - os: linux-ppc64le
env: env:
- CMAKE_FLAGS="" - CMAKE_FLAGS=""
before_install: before_install:
- eval "${MATRIX_EVAL}"
- which clang-tidy || true - which clang-tidy || true
- ls -la `which clang-tidy` || true - ls -la `which clang-tidy` || true
- echo $PATH - echo $PATH
- echo $MATRIX_EVAL
- eval "${MATRIX_EVAL}"
before_script: before_script:
- mkdir $HOME/fluidsynth_install/ - mkdir $HOME/fluidsynth_install/

8
src/utils/fluid_sys.h
View file

@ -404,19 +404,19 @@ typedef GStaticPrivate fluid_private_t;
g_atomic_pointer_compare_and_exchange(_pp, _old, _new) g_atomic_pointer_compare_and_exchange(_pp, _old, _new)
static FLUID_INLINE void static FLUID_INLINE void
fluid_atomic_float_set(volatile float *fptr, float val) fluid_atomic_float_set(fluid_atomic_float_t *fptr, float val)
{ {
int32_t ival; int32_t ival;
memcpy(&ival, &val, 4); memcpy(&ival, &val, 4);
fluid_atomic_int_set((volatile int *)fptr, ival); fluid_atomic_int_set((fluid_atomic_int_t *)fptr, ival);
} }
static FLUID_INLINE float static FLUID_INLINE float
fluid_atomic_float_get(volatile float *fptr) fluid_atomic_float_get(fluid_atomic_float_t *fptr)
{ {
int32_t ival; int32_t ival;
float fval; float fval;
ival = fluid_atomic_int_get((volatile int *)fptr); ival = fluid_atomic_int_get((fluid_atomic_int_t *)fptr);
memcpy(&fval, &ival, 4); memcpy(&fval, &ival, 4);
return fval; return fval;
} }

2
src/utils/fluidsynth_priv.h
View file

@ -214,7 +214,7 @@ void* fluid_alloc(size_t len);
#define FLUID_STRCPY(_dst,_src) strcpy(_dst,_src) #define FLUID_STRCPY(_dst,_src) strcpy(_dst,_src)
#define FLUID_STRNCPY(_dst,_src,_n) \ #define FLUID_STRNCPY(_dst,_src,_n) \
do { strncpy(_dst,_src,_n); \ do { strncpy(_dst,_src,_n-1); \
(_dst)[(_n)-1]='\0'; \ (_dst)[(_n)-1]='\0'; \
}while(0) }while(0)