From 4a9b5cee962a4b1059ce593b35c6209bd35f1d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Mon, 4 Jan 2021 18:23:05 +0000 Subject: [PATCH 1/6] Raise Git's http.postBuffer to something high for macOS actions --- .github/workflows/macos-cmake.yaml | 2 ++ .github/workflows/macos-make-btaddon.yml | 2 ++ .github/workflows/macos-make.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/macos-cmake.yaml b/.github/workflows/macos-cmake.yaml index 8c6a41f37..8dc2d358e 100644 --- a/.github/workflows/macos-cmake.yaml +++ b/.github/workflows/macos-cmake.yaml @@ -8,6 +8,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high + run: git config --global http.postBuffer 524288000 - name: Update brew repos run: brew update - name: Tap RfidResearchGroup/proxmark3 diff --git a/.github/workflows/macos-make-btaddon.yml b/.github/workflows/macos-make-btaddon.yml index 9d5b75ff7..79d2c4afa 100644 --- a/.github/workflows/macos-make-btaddon.yml +++ b/.github/workflows/macos-make-btaddon.yml @@ -8,6 +8,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high + run: git config --global http.postBuffer 524288000 - name: Update brew repos run: brew update - name: Tap RfidResearchGroup/proxmark3 diff --git a/.github/workflows/macos-make.yml b/.github/workflows/macos-make.yml index a612bcda2..01300ab28 100644 --- a/.github/workflows/macos-make.yml +++ b/.github/workflows/macos-make.yml @@ -9,6 +9,8 @@ jobs: steps: - uses: actions/checkout@v2 - name: Update brew repos + - name: Set Git http.postBuffer to something high + run: git config --global http.postBuffer 524288000 run: brew update - name: Tap RfidResearchGroup/proxmark3 run: brew tap RfidResearchGroup/proxmark3 From 1fb17aad3f8c6e48757b7594a0c32f0376ad7f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Mon, 4 Jan 2021 18:24:48 +0000 Subject: [PATCH 2/6] Oops, fast paste failed --- .github/workflows/macos-make.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-make.yml b/.github/workflows/macos-make.yml index 01300ab28..aecc22b8c 100644 --- a/.github/workflows/macos-make.yml +++ b/.github/workflows/macos-make.yml @@ -8,9 +8,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Update brew repos - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 + - name: Update brew repos run: brew update - name: Tap RfidResearchGroup/proxmark3 run: brew tap RfidResearchGroup/proxmark3 From 0bc2bbef52327249eaeedd3bda8e144c67a4144e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Mon, 4 Jan 2021 18:40:21 +0000 Subject: [PATCH 3/6] merge macos jobs to 1 workflow, run 'em sequentially --- .github/workflows/macos-cmake.yaml | 22 --------- .github/workflows/macos-make-btaddon.yml | 22 --------- .github/workflows/macos-make.yml | 22 --------- .github/workflows/macos.yml | 62 ++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 66 deletions(-) delete mode 100644 .github/workflows/macos-cmake.yaml delete mode 100644 .github/workflows/macos-make-btaddon.yml delete mode 100644 .github/workflows/macos-make.yml create mode 100644 .github/workflows/macos.yml diff --git a/.github/workflows/macos-cmake.yaml b/.github/workflows/macos-cmake.yaml deleted file mode 100644 index 8dc2d358e..000000000 --- a/.github/workflows/macos-cmake.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: MacOS (cmake) Build and Test - -on: [push, pull_request] - -jobs: - build: - runs-on: macos-latest - - steps: - - uses: actions/checkout@v2 - - name: Set Git http.postBuffer to something high - run: git config --global http.postBuffer 524288000 - - name: Update brew repos - run: brew update - - name: Tap RfidResearchGroup/proxmark3 - run: brew tap RfidResearchGroup/proxmark3 - - name: Install dependencies - run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc - - name: Build - run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 ) - - name: Test - run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3" diff --git a/.github/workflows/macos-make-btaddon.yml b/.github/workflows/macos-make-btaddon.yml deleted file mode 100644 index 79d2c4afa..000000000 --- a/.github/workflows/macos-make-btaddon.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: MacOS (make with BTADDON) Build and Test - -on: [push, pull_request] - -jobs: - build: - runs-on: macos-latest - - steps: - - uses: actions/checkout@v2 - - name: Set Git http.postBuffer to something high - run: git config --global http.postBuffer 524288000 - - name: Update brew repos - run: brew update - - name: Tap RfidResearchGroup/proxmark3 - run: brew tap RfidResearchGroup/proxmark3 - - name: Install dependencies - run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc - - name: Build - run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON - - name: Test - run: make check diff --git a/.github/workflows/macos-make.yml b/.github/workflows/macos-make.yml deleted file mode 100644 index aecc22b8c..000000000 --- a/.github/workflows/macos-make.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: MacOS (make) Build and Test - -on: [push, pull_request] - -jobs: - build: - runs-on: macos-latest - - steps: - - uses: actions/checkout@v2 - - name: Set Git http.postBuffer to something high - run: git config --global http.postBuffer 524288000 - - name: Update brew repos - run: brew update - - name: Tap RfidResearchGroup/proxmark3 - run: brew tap RfidResearchGroup/proxmark3 - - name: Install dependencies - run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc - - name: Build - run: make clean && make V=1 - - name: Test - run: make check diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 000000000..97495eb28 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,62 @@ +name: MacOS Build and Test + +on: [push, pull_request] + +jobs: + build-make: + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high + run: git config --global http.postBuffer 524288000 + - name: Update brew repos + run: brew update + - name: Tap RfidResearchGroup/proxmark3 + run: brew tap RfidResearchGroup/proxmark3 + - name: Install dependencies + run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc + - name: Build + run: make clean && make V=1 + - name: Test + run: make check + + build-make-btaddon: + if: always() + needs: [build-make] + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high + run: git config --global http.postBuffer 524288000 + - name: Update brew repos + run: brew update + - name: Tap RfidResearchGroup/proxmark3 + run: brew tap RfidResearchGroup/proxmark3 + - name: Install dependencies + run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc + - name: Build + run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON + - name: Test + run: make check + + build-cmake: + if: always() + needs: [build-make, build-make-btaddon] + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high + run: git config --global http.postBuffer 524288000 + - name: Update brew repos + run: brew update + - name: Tap RfidResearchGroup/proxmark3 + run: brew tap RfidResearchGroup/proxmark3 + - name: Install dependencies + run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc + - name: Build + run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 ) + - name: Test + run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3" From b05b94f619f0f724053b9a30d539871e26f5e33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Mon, 4 Jan 2021 19:00:10 +0000 Subject: [PATCH 4/6] tweak jobs --- .github/workflows/macos.yml | 48 ++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 97495eb28..9ccb51e39 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,16 +8,28 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 + - name: Update brew repos run: brew update + continue-on-error: true + - name: Tap RfidResearchGroup/proxmark3 run: brew tap RfidResearchGroup/proxmark3 + - name: Install dependencies run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc + + - name: make clean + run: make clean + - name: Build - run: make clean && make V=1 + env: + V: 1 + run: make + - name: Test run: make check @@ -28,16 +40,29 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 + - name: Update brew repos run: brew update + continue-on-error: true + - name: Tap RfidResearchGroup/proxmark3 run: brew tap RfidResearchGroup/proxmark3 + - name: Install dependencies run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc + + - name: make clean + run: make clean + - name: Build - run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON + env: + V: 1 + PLATFORM_EXTRAS: BTADDON + run: make + - name: Test run: make check @@ -48,15 +73,32 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 + - name: Update brew repos run: brew update + continue-on-error: true + - name: Tap RfidResearchGroup/proxmark3 run: brew tap RfidResearchGroup/proxmark3 + - name: Install dependencies run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc + + - name: Prepare Build Folders + run: mkdir -p client/build + + - name: Initiate cmake environment + run: cmake .. + working-directory: client/build/ + - name: Build - run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 ) + env: + VERBOSE: 1 + run: make + working-directory: client/build/ + - name: Test run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3" From 12d700136fc2014ed34afcea602b51a3bce72d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Mon, 4 Jan 2021 19:18:08 +0000 Subject: [PATCH 5/6] workflow cleaning --- .github/workflows/macos.yml | 25 ++++++- .github/workflows/ubuntu-cmake.yml | 18 ----- .github/workflows/ubuntu-make-btaddon.yml | 18 ----- .github/workflows/ubuntu-make.yml | 18 ----- .github/workflows/ubuntu.yml | 85 +++++++++++++++++++++++ 5 files changed, 109 insertions(+), 55 deletions(-) delete mode 100644 .github/workflows/ubuntu-cmake.yml delete mode 100644 .github/workflows/ubuntu-make-btaddon.yml delete mode 100644 .github/workflows/ubuntu-make.yml create mode 100644 .github/workflows/ubuntu.yml diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9ccb51e39..d10bb7cc6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -12,6 +12,13 @@ jobs: - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 + - name: handle homebrew quirks + run: | + brew uninstall openssl@1.0.2t + rm -rf /usr/local/etc/openssl + rm -rf /usr/local/etc/openssl@1.1 + rm -rf /usr/local/bin/2to3 + - name: Update brew repos run: brew update continue-on-error: true @@ -44,6 +51,13 @@ jobs: - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 + - name: handle homebrew quirks + run: | + brew uninstall openssl@1.0.2t + rm -rf /usr/local/etc/openssl + rm -rf /usr/local/etc/openssl@1.1 + rm -rf /usr/local/bin/2to3 + - name: Update brew repos run: brew update continue-on-error: true @@ -77,6 +91,13 @@ jobs: - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 + - name: handle homebrew quirks + run: | + brew uninstall openssl@1.0.2t + rm -rf /usr/local/etc/openssl + rm -rf /usr/local/etc/openssl@1.1 + rm -rf /usr/local/bin/2to3 + - name: Update brew repos run: brew update continue-on-error: true @@ -101,4 +122,6 @@ jobs: working-directory: client/build/ - name: Test - run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3" + env: + CHECKARGS: "--clientbin ./client/build/proxmark3" + run: make client/check diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml deleted file mode 100644 index dd99487f1..000000000 --- a/.github/workflows/ubuntu-cmake.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Ubuntu (cmake) Build and Test - -on: [push, pull_request] - -jobs: - build-and-test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Update apt repos - run: sudo apt-get update - - name: Install dependencies - run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed - - name: Build - run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 ) - - name: Test - run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3" diff --git a/.github/workflows/ubuntu-make-btaddon.yml b/.github/workflows/ubuntu-make-btaddon.yml deleted file mode 100644 index 0e11f01c3..000000000 --- a/.github/workflows/ubuntu-make-btaddon.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Ubuntu (make with BTADDON) Build and Test - -on: [push, pull_request] - -jobs: - build-and-test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Update apt repos - run: sudo apt-get update - - name: Install dependencies - run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed - - name: Build - run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON - - name: Test - run: make check diff --git a/.github/workflows/ubuntu-make.yml b/.github/workflows/ubuntu-make.yml deleted file mode 100644 index f4f7d0113..000000000 --- a/.github/workflows/ubuntu-make.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Ubuntu (make) Build and Test - -on: [push, pull_request] - -jobs: - build-and-test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Update apt repos - run: sudo apt-get update - - name: Install dependencies - run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed - - name: Build - run: make clean && make V=1 - - name: Test - run: make check diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml new file mode 100644 index 000000000..394088e87 --- /dev/null +++ b/.github/workflows/ubuntu.yml @@ -0,0 +1,85 @@ +name: Ubuntu Build and Test + +on: [push, pull_request] + +jobs: + build-make: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install dependencies + run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed + + - name: make clean + run: make clean + + - name: Build + env: + V: 1 + run: make + + - name: Test + run: make check + + build-make-btaddon: + if: always() + needs: [build-make] + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install dependencies + run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed + + - name: make clean + run: make clean + + - name: Build + env: + V: 1 + PLATFORM_EXTRAS: BTADDON + run: make + + - name: Test + run: make check + + build-cmake: + if: always() + needs: [build-make, build-make-btaddon] + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install dependencies + run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed + + - name: Prepare Build Folders + run: mkdir -p client/build + + - name: Initiate cmake environment + run: cmake .. + working-directory: client/build/ + + - name: Build + env: + VERBOSE: 1 + run: make + working-directory: client/build/ + + - name: Test + env: + CHECKARGS: "--clientbin ./client/build/proxmark3" + run: make client/check From 6b11b18314edcaa0297faed6bf86de6cf6541e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Mon, 4 Jan 2021 19:20:38 +0000 Subject: [PATCH 6/6] workflow changes --- .github/workflows/macos.yml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d10bb7cc6..cef27e89e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -12,12 +12,8 @@ jobs: - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 - - name: handle homebrew quirks - run: | - brew uninstall openssl@1.0.2t - rm -rf /usr/local/etc/openssl - rm -rf /usr/local/etc/openssl@1.1 - rm -rf /usr/local/bin/2to3 + - name: Handle homebrew quirks + run: rm -rf /usr/local/bin/2to3 - name: Update brew repos run: brew update @@ -51,12 +47,8 @@ jobs: - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 - - name: handle homebrew quirks - run: | - brew uninstall openssl@1.0.2t - rm -rf /usr/local/etc/openssl - rm -rf /usr/local/etc/openssl@1.1 - rm -rf /usr/local/bin/2to3 + - name: Handle homebrew quirks + run: rm -rf /usr/local/bin/2to3 - name: Update brew repos run: brew update @@ -91,12 +83,8 @@ jobs: - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 - - name: handle homebrew quirks - run: | - brew uninstall openssl@1.0.2t - rm -rf /usr/local/etc/openssl - rm -rf /usr/local/etc/openssl@1.1 - rm -rf /usr/local/bin/2to3 + - name: Handle homebrew quirks + run: rm -rf /usr/local/bin/2to3 - name: Update brew repos run: brew update