forked from osmocom/wireshark
CI: Don't run xcode-select.
Changing the developer directory shouldn't be necessary after the include
path fixups in 270c8ed746
.
This commit is contained in:
parent
61d53b74c9
commit
313a6e9274
|
@ -29,10 +29,6 @@ jobs:
|
||||||
run: gem install asciidoctor
|
run: gem install asciidoctor
|
||||||
- name: Mkdir
|
- name: Mkdir
|
||||||
run: mkdir build
|
run: mkdir build
|
||||||
- name: Select xcode
|
|
||||||
run: |
|
|
||||||
sudo xcode-select --switch /Library/Developer/CommandLineTools
|
|
||||||
xcode-select --print-path
|
|
||||||
- name: Cmake
|
- name: Cmake
|
||||||
working-directory: build
|
working-directory: build
|
||||||
run: cmake -GNinja ..
|
run: cmake -GNinja ..
|
||||||
|
|
|
@ -65,8 +65,6 @@ before_install:
|
||||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
|
||||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install softhsm; fi
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install softhsm; fi
|
||||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sed s/access_bpf/staff/ packaging/macosx/ChmodBPF/ChmodBPF | sudo bash; fi
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sed s/access_bpf/staff/ packaging/macosx/ChmodBPF/ChmodBPF | sudo bash; fi
|
||||||
# Required to fix an issue on macOS 10.14. Remove it as soon as Travis moves to 10.15.
|
|
||||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo xcode-select --switch /Library/Developer/CommandLineTools; fi
|
|
||||||
# linux
|
# linux
|
||||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional --install-test-deps -q; fi
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional --install-test-deps -q; fi
|
||||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y python3-pip; fi
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y python3-pip; fi
|
||||||
|
|
Loading…
Reference in New Issue