From b35c11f95e563899956ba1ac14f2ea2576453e3c Mon Sep 17 00:00:00 2001 From: merlokk Date: Fri, 1 Dec 2017 18:49:31 +0200 Subject: [PATCH 01/13] init travis from https://github.com/pwpiwi/proxmark3/tree/travis_test --- travis.yml | 48 ++++++++++++++++++++++++++++++++++++++++ travis_test_commands.scr | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 travis.yml create mode 100644 travis_test_commands.scr diff --git a/travis.yml b/travis.yml new file mode 100644 index 00000000..f9d505b9 --- /dev/null +++ b/travis.yml @@ -0,0 +1,48 @@ +# Travis-CI config +language: c + +compiler: gcc + +# Test on Linux and MacOS +matrix: + include: + - os: osx + osx_image: xcode7.3 # OS X 10.11 + - os: osx + osx_image: xcode8 # OS X 10.11 + - os: osx + osx_image: xcode8.1 # OS X 10.12 + - os: osx + osx_image: xcode8.3 # OS X 10.12 + - os: linux + dist: trusty + sudo: required + +before_install: +## Install ARM toolchain on Linux. +## add our homebrew tap for MacOS +## Note: all dependencies on MacOS should be resolved by the brew install command + if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + sudo apt-get update -qq; + sudo apt-get install -y gcc-arm-none-eabi; + elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew update; + brew tap pwpiwi/proxmark3; + fi + +install: + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew install -v --HEAD proxmark3; + elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + make all; + fi + +before_script: + +script: +## for the time being we are satisfied if it can be build and then successfully started + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + proxmark3 /dev/notexists travis_test_commands.scr ; + elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + ./client/proxmark3 /dev/notexists travis_test_commands.scr ; + fi diff --git a/travis_test_commands.scr b/travis_test_commands.scr new file mode 100644 index 00000000..0dba3526 --- /dev/null +++ b/travis_test_commands.scr @@ -0,0 +1,2 @@ +hf mf hardnested t 1 000000000000 +exit From b6c370f1714a5731cc438b4d9f2dfd90684c875e Mon Sep 17 00:00:00 2001 From: merlokk Date: Fri, 1 Dec 2017 18:54:54 +0200 Subject: [PATCH 02/13] added REPOSITORY_EP var --- travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/travis.yml b/travis.yml index f9d505b9..b52d1f65 100644 --- a/travis.yml +++ b/travis.yml @@ -1,4 +1,5 @@ # Travis-CI config +# variable REPOSITORY_EP must be filled with repository name. as sample: "merlokk/proxmark3" language: c compiler: gcc @@ -27,7 +28,7 @@ before_install: sudo apt-get install -y gcc-arm-none-eabi; elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; - brew tap pwpiwi/proxmark3; + brew tap "$REPOSITORY_EP"; fi install: From 755c72b798438b795aa15688b9a3d5ac92487818 Mon Sep 17 00:00:00 2001 From: merlokk Date: Fri, 1 Dec 2017 18:57:31 +0200 Subject: [PATCH 03/13] rename travis file --- travis.yml => .travis.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename travis.yml => .travis.yml (100%) diff --git a/travis.yml b/.travis.yml similarity index 100% rename from travis.yml rename to .travis.yml From 2e35aa3aa7d09cf2caa85a5a9f2b6cdfc74afb87 Mon Sep 17 00:00:00 2001 From: merlokk Date: Sat, 2 Dec 2017 11:51:12 +0200 Subject: [PATCH 04/13] added info --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b52d1f65..22f6ed7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ before_install: install: if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew info proxmark3; brew install -v --HEAD proxmark3; elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make all; From a36b278fadd47997b4d8e69dfeb4a126aa1932ee Mon Sep 17 00:00:00 2001 From: merlokk Date: Sat, 2 Dec 2017 13:06:51 +0200 Subject: [PATCH 05/13] add options show --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 22f6ed7b..ecff0810 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,7 @@ before_install: install: if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew info proxmark3; + brew options proxmark3; brew install -v --HEAD proxmark3; elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make all; From 3c9b6573ecb23e7888e8077bc980de0ade361afa Mon Sep 17 00:00:00 2001 From: merlokk Date: Sat, 2 Dec 2017 16:24:47 +0200 Subject: [PATCH 06/13] remove show options --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ecff0810..22f6ed7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ before_install: install: if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew info proxmark3; - brew options proxmark3; brew install -v --HEAD proxmark3; elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make all; From 245a6b208328a0a1df819af53b182d720b3e2196 Mon Sep 17 00:00:00 2001 From: merlokk Date: Sat, 2 Dec 2017 16:41:39 +0200 Subject: [PATCH 07/13] added xcode 9 and 9.1 coz 8 and 8.1 links to 8.3 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22f6ed7b..eed0f8e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,12 @@ matrix: include: - os: osx osx_image: xcode7.3 # OS X 10.11 - - os: osx - osx_image: xcode8 # OS X 10.11 - - os: osx - osx_image: xcode8.1 # OS X 10.12 - os: osx osx_image: xcode8.3 # OS X 10.12 + - os: osx + osx_image: xcode9 # OS X 10.13 + - os: osx + osx_image: xcode9.1 # OS X 10.13.1 - os: linux dist: trusty sudo: required From b0c73387f0cd76d921ea2102a63462aad66008e8 Mon Sep 17 00:00:00 2001 From: merlokk Date: Sat, 2 Dec 2017 22:10:25 +0200 Subject: [PATCH 08/13] added if --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eed0f8e5..94030db5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,11 @@ before_install: sudo apt-get install -y gcc-arm-none-eabi; elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; - brew tap "$REPOSITORY_EP"; + if [[ "$REPOSITORY_EP" == "" ]]; then + brew tap proxmark/proxmark3; + else + brew tap "$REPOSITORY_EP"; + fi fi install: From 1e431c5d360fc1fde456c0dac3fb5c6085826aff Mon Sep 17 00:00:00 2001 From: merlokk Date: Sat, 2 Dec 2017 22:12:41 +0200 Subject: [PATCH 09/13] get rid of tabs) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94030db5..918240c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,11 @@ before_install: sudo apt-get install -y gcc-arm-none-eabi; elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; - if [[ "$REPOSITORY_EP" == "" ]]; then + if [[ "$REPOSITORY_EP" == "" ]]; then brew tap proxmark/proxmark3; - else + else brew tap "$REPOSITORY_EP"; - fi + fi fi install: From b1c0f020988313a286f45669dcc505e66533640c Mon Sep 17 00:00:00 2001 From: merlokk Date: Sun, 24 Dec 2017 00:28:38 +0200 Subject: [PATCH 10/13] added xcode 9.2 and some logging --- .travis.yml | 7 ++++--- travis_test_commands.scr | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 918240c7..8e9289b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ matrix: - os: osx osx_image: xcode8.3 # OS X 10.12 - os: osx - osx_image: xcode9 # OS X 10.13 + osx_image: xcode9 # OS X 10.12 - os: osx - osx_image: xcode9.1 # OS X 10.13.1 + osx_image: xcode9.2 # OS X 10.12 - os: linux dist: trusty sudo: required @@ -23,6 +23,7 @@ before_install: ## Install ARM toolchain on Linux. ## add our homebrew tap for MacOS ## Note: all dependencies on MacOS should be resolved by the brew install command + echo $REPOSITORY_EP; if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; sudo apt-get install -y gcc-arm-none-eabi; @@ -31,7 +32,7 @@ before_install: if [[ "$REPOSITORY_EP" == "" ]]; then brew tap proxmark/proxmark3; else - brew tap "$REPOSITORY_EP"; + brew tap "$REPOSITORY_EP" --env=std; fi fi diff --git a/travis_test_commands.scr b/travis_test_commands.scr index 0dba3526..4f5b025c 100644 --- a/travis_test_commands.scr +++ b/travis_test_commands.scr @@ -1,2 +1,3 @@ hf mf hardnested t 1 000000000000 +hf emv test exit From 58f0ae45c1f3bbe6d962aece3694c61f78475da3 Mon Sep 17 00:00:00 2001 From: merlokk Date: Fri, 5 Jan 2018 11:51:51 +0200 Subject: [PATCH 11/13] move travis files --- .travis.yml => CI/.travis.yml | 0 CI/readme.md | 19 +++++++++++++++++++ .../travis_test_commands.scr | 0 3 files changed, 19 insertions(+) rename .travis.yml => CI/.travis.yml (100%) create mode 100644 CI/readme.md rename travis_test_commands.scr => CI/travis_test_commands.scr (100%) diff --git a/.travis.yml b/CI/.travis.yml similarity index 100% rename from .travis.yml rename to CI/.travis.yml diff --git a/CI/readme.md b/CI/readme.md new file mode 100644 index 00000000..bcfc4542 --- /dev/null +++ b/CI/readme.md @@ -0,0 +1,19 @@ +# How to configure continuous integration + +Here 2 CI configuration files: + +1. for [travis](travis-ci.org) +2. for [appveyor](appveyor.com) + +It needs to put files from this directory to repository root and then configure CI from appropriate WEB portal. + +## travis + +- Copy .travis.yml and travis_test_commands.scr files to repository root +- Configure CI from http://travis-ci.org +- It needs to clone https://github.com/Proxmark/homebrew-proxmark3 from your proxmark repository home + + +## appveyor + +- Just copy appveyor.yml file to root and configure it from http://appveyor.com diff --git a/travis_test_commands.scr b/CI/travis_test_commands.scr similarity index 100% rename from travis_test_commands.scr rename to CI/travis_test_commands.scr From 7421ab0b43ba71f214f3cf24e28aa32d4e2ed844 Mon Sep 17 00:00:00 2001 From: merlokk Date: Fri, 5 Jan 2018 13:04:17 +0200 Subject: [PATCH 12/13] fix readme --- CI/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CI/readme.md b/CI/readme.md index bcfc4542..d4159290 100644 --- a/CI/readme.md +++ b/CI/readme.md @@ -11,7 +11,8 @@ It needs to put files from this directory to repository root and then configure - Copy .travis.yml and travis_test_commands.scr files to repository root - Configure CI from http://travis-ci.org -- It needs to clone https://github.com/Proxmark/homebrew-proxmark3 from your proxmark repository home +- It needs to fork https://github.com/Proxmark/homebrew-proxmark3 from your proxmark repository home +- Put to file `proxmark3.rb` in line `head "https://github.com/proxmark/proxmark3.git"` your repository link. As sample: `head "https://github.com/merlokk/proxmark3.git"` ## appveyor From 84e86ed9e3c435bd386370ea4c18887decfb48c6 Mon Sep 17 00:00:00 2001 From: merlokk Date: Sun, 7 Jan 2018 23:23:35 +0200 Subject: [PATCH 13/13] move appveyor.yml --- appveyor.yml => CI/appveyor.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename appveyor.yml => CI/appveyor.yml (100%) diff --git a/appveyor.yml b/CI/appveyor.yml similarity index 100% rename from appveyor.yml rename to CI/appveyor.yml