From 1c74052335def6186514f6696b3e86ff8de2d097 Mon Sep 17 00:00:00 2001 From: lepapareil Date: Fri, 5 Nov 2021 16:44:56 +0100 Subject: [PATCH 1/3] fix arm64 tests on circleci --- .circleci/config.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index beb0481bbdf..808d4a250a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: steps: - checkout - run: - name: build + name: Build command: | uname -a lsb_release -a @@ -18,29 +18,31 @@ jobs: cargo --version cargo build --verbose --color always - run: - name: Run Tests units + name: Tests units and integration tests command: | - sudo apt update - sudo apt install -y libxml2-utils - python3 -m pip install --upgrade pip - pip3 install Flask mitmproxy + sudo apt update -qq + sudo apt install -y -qq libxml2-utils + python3 -m pip install --upgrade pip --quiet + pip3 install Flask mitmproxy --quiet mitmdump --version + export PATH="$PWD/target/debug:$PATH" cd integration python3 server.py >server.log 2>&1 & python3 ssl/server.py >server-ssl.log 2>&1 & mitmdump -p 8888 --modify-header "/From-Proxy/Hello" >mitmdump.log 2>&1 & + echo "================= Tests units =================" cargo test --features strict --verbose --color always - - run: - name: Run Integration Tests - command: | - export PATH="$PWD/target/debug:$PATH" - cd integration - pip3 install lxml bs4 + sudo apt update -qq + sudo apt install -y -qq libxml2-utils + python3 -m pip install --upgrade pip + pip3 install Flask mitmproxy --quiet + mitmdump --version + pip3 install lxml bs4 --quiet + echo "================= Integration tests =================" python3 ./integration.py ./test_curl_commands.sh tests/*.curl python3 ./test_html_output.py tests/*.html xmllint --noout tests/*.html - - store_artifacts: path: integration/mitmdump.log From 6ed0c4874a701326a08aeadf7de73d6a712d7aa6 Mon Sep 17 00:00:00 2001 From: lepapareil Date: Fri, 5 Nov 2021 16:45:42 +0100 Subject: [PATCH 2/3] add circleci badge on README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 50056a1c520..b550c2b7071 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@
[![deploy status](https://github.com/Orange-OpenSource/hurl/workflows/CI/badge.svg)](https://github.com/Orange-OpenSource/hurl/actions) +[![CircleCI](https://circleci.com/gh/lepapareil/hurl/tree/master.svg?style=svg)](https://circleci.com/gh/lepapareil/hurl/tree/master) [![Crates.io](https://img.shields.io/crates/v/hurl.svg)](https://crates.io/crates/hurl) [![documentation](https://img.shields.io/badge/-documentation-informational)](https://hurl.dev) From 33e2e469f7aaef399080bb7cebd7e9bb05bc53f1 Mon Sep 17 00:00:00 2001 From: lepapareil Date: Fri, 5 Nov 2021 16:47:38 +0100 Subject: [PATCH 3/3] rename circleci workflow name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 808d4a250a7..eef92119b50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,6 +53,6 @@ jobs: path: integration/server-ssl.log workflows: - arm64: + tests-arm64: jobs: - test-ubuntu-arm64