From c245274e059063a816ed6629ea7a77d5bb267d4a Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Thu, 18 Apr 2019 09:19:24 +0200 Subject: [PATCH] Try to set HEAD correctly --- .circleci/config.yml | 9 ++++----- .travis.yml | 4 ++++ appveyor.yml | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24a6fe62..28766c50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,11 +4,13 @@ version: 2 machine: true steps: - checkout - - run: + - run: &checkouttask name: Pull submodules command: | git submodule init git submodule update + git checkout $CIRCLECI_BRANCH + git reset --hard $CIRCLECI_SHA1 - run: name: Install the emulation handlers command: docker run --rm --privileged multiarch/qemu-user-static:register --reset @@ -27,10 +29,7 @@ version: 2 steps: - checkout - run: - name: Pull submodules - command: | - git submodule init - git submodule update + <<: *checkouttask - run: name: Run tests command: | diff --git a/.travis.yml b/.travis.yml index 30ea3fda..2d0c501e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ matrix: before_script: - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* - git fetch --unshallow + - git checkout $TRAVIS_BRANCH + - git reset --hard $TRAVIS_COMMIT script: - "cd test && python3 -m nose --rednose --verbose" env: @@ -31,6 +33,8 @@ matrix: before_install: - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* - git fetch --unshallow + - git checkout $TRAVIS_BRANCH + - git reset --hard $TRAVIS_COMMIT - pip3 install -r requirements.txt - brew link gcc - export PATH="/usr/local/bin:$PATH" diff --git a/appveyor.yml b/appveyor.yml index cba69d42..41dfba47 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,9 @@ init: build_script: - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* - - git fetch + - git fetch --unshallow + - git checkout %APPVEYOR_REPO_BRANCH% + - git reset --hard %APPVEYOR_REPO_COMMIT% - python -m pip install -r requirements.txt - cd test # Download Astyle to local folder because putting it in PATH doesn't work