Skip to content

Commit 93adef9

Browse files
authored
Update config.yml
1 parent 2339c02 commit 93adef9

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.circleci/config.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ jobs:
1515
name: Set up ssh & known_hosts
1616
command: sudo sed -i -e 's/#ListenAddress/ListenAddress/' /etc/ssh/sshd_config; sudo sed -i -e 's/AddressFamily inet/AddressFamily any/' /etc/ssh/sshd_config; sudo /etc/init.d/ssh restart; rm -f ~/.ssh/id_rsa*; ssh-keygen -q -N "" -f ~/.ssh/id_rsa; sudo rm -f ~/.ssh/authorized_keys; cp ~/.ssh/id_rsa.pub ~/.ssh/authorized_keys; rm -f ~/.ssh/known_hosts; ssh -o "StrictHostKeyChecking no" localhost ls; ssh -o "StrictHostKeyChecking no" 0:0:0:0:0:0:0:1 ls
1717

18-
- run:
19-
name: Init submodules
20-
command: if [ $CIRCLE_BRANCH != "release" ]; then git submodule update --init --recursive; fi
2118
- run:
2219
name: vcpkg
23-
command: if [ $CIRCLE_BRANCH != "release" ]; then external/vcpkg/bootstrap-vcpkg.sh; mkdir build; ./external/vcpkg/vcpkg --x-install-root=$PWD/build/vcpkg_installed --triplet=x64-linux --feature-flags="manifests" install; fi
20+
command: external_imported/vcpkg/bootstrap-vcpkg.sh; mkdir build; ./external_imported/vcpkg/vcpkg --x-install-root=$PWD/build/vcpkg_installed --triplet=x64-linux --feature-flags="manifests" install
2421
- run:
2522
name: Build the root version of the project
2623
command: mkdir ../root_version; cp -Rf .git * ../root_version/; cd ../root_version; git checkout v6; git submodule update --init --recursive; cd build; cmake ../; make -j4
@@ -72,12 +69,9 @@ jobs:
7269
- run:
7370
name: Set up ssh & known_hosts
7471
command: sudo /etc/init.d/ssh start; rm -f ~/.ssh/id_rsa*; ssh-keygen -q -N "" -f ~/.ssh/id_rsa; sudo rm -f ~/.ssh/authorized_keys; cp ~/.ssh/id_rsa.pub ~/.ssh/authorized_keys; rm -f ~/.ssh/known_hosts; ssh -o "StrictHostKeyChecking no" localhost ls
75-
- run:
76-
name: Init submodules
77-
command: if [ $CIRCLE_BRANCH != "release" ]; then git submodule update --init --recursive; fi
7872
- run:
7973
name: vcpkg
80-
command: if [ $CIRCLE_BRANCH != "release" ]; then external/vcpkg/bootstrap-vcpkg.sh; mkdir build; ./external/vcpkg/vcpkg --x-install-root=$PWD/build/vcpkg_installed --triplet=x64-linux --feature-flags="manifests" install; fi
74+
command: external_imported/vcpkg/bootstrap-vcpkg.sh; mkdir build; ./external_imported/vcpkg/vcpkg --x-install-root=$PWD/build/vcpkg_installed --triplet=x64-linux --feature-flags="manifests" install
8175
- run:
8276
name: Build the project
8377
command: cd build; cmake -DCMAKE_INSTALL_PREFIX=/usr ../; make -j4; sudo make install

0 commit comments

Comments
 (0)