A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/stlink-org/stlink/commit/f5ada9474cdb87ff37de0d4eb9e75622b5870646 below:

Merge branch 'testing' into develop · stlink-org/stlink@f5ada94 · GitHub

File tree Expand file treeCollapse file tree 2 files changed

+56

-4

lines changed

Filter options

Expand file treeCollapse file tree 2 files changed

+56

-4

lines changed Original file line number Diff line number Diff line change

@@ -22,9 +22,7 @@ elif [ "$TRAVIS_JOB_NAME" == "linux-mingw-32" ]; then

22 22

-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR

23 23

make && rm -rf build-mingw-32 && cd -

24 24 25 -

elif [ "$TRAVIS_OS_NAME" == "linux" ]; then

26 -

sudo apt-get update -qq || true

27 - 25 +

elif [ "$TRAVIS_OS_NAME" == "osx" ]; then

28 26

echo "--> Building Debug..."

29 27

mkdir -p build/Debug && cd build/Debug

30 28

cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR

Original file line number Diff line number Diff line change

@@ -26,8 +26,62 @@ jobs:

26 26

packages:

27 27

["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm", "mingw-w64"]

28 28 29 +

### macOS ###

30 + 31 +

- os: osx

32 +

env: BADGE=osx

33 +

osx_image: xcode10.3

34 +

name: macOS 10.14.4 gcc

35 +

compiler: gcc

36 +

addons:

37 +

homebrew:

38 +

packages:

39 +

- gcc

40 +

- libusb

41 +

- gtk+3

42 + 43 +

- os: osx

44 +

env: BADGE=osx

45 +

osx_image: xcode10.3

46 +

name: macOS 10.14.4 gcc 32-bit

47 +

compiler: gcc

48 +

addons:

49 +

homebrew:

50 +

packages:

51 +

- gcc

52 +

- libusb

53 +

- gtk+3

54 +

before_install:

55 +

- CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";

56 + 57 +

- os: osx

58 +

env: BADGE=osx

59 +

osx_image: xcode10.3

60 +

name: macOS 10.14.4 clang

61 +

compiler: clang

62 +

addons:

63 +

homebrew:

64 +

packages:

65 +

- clang

66 +

- libusb

67 +

- gtk+3

68 + 69 +

- os: osx

70 +

env: BADGE=osx

71 +

osx_image: xcode10.3

72 +

name: macOS 10.14.4 clang 32-bit

73 +

compiler: gcc

74 +

addons:

75 +

homebrew:

76 +

packages:

77 +

- clang

78 +

- libusb

79 +

- gtk+3

80 +

before_install:

81 +

- CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";

82 + 29 83

script:

30 84

- git fetch --tags

31 85

- printenv

32 86

- cmake --version

33 -

- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis.sh; fi

87 +

- if [[ "$TRAVIS_OS_NAME" == "linux" ]] || [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis.sh; fi

You can’t perform that action at this time.


RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4