From 3d824425d2b9072736c47d84a47e831d7df28316 Mon Sep 17 00:00:00 2001 From: Henry Gabryjelski Date: Sun, 5 May 2024 18:23:45 -0700 Subject: [PATCH 1/4] Use `actions/setup-python` for MacOS --- .github/workflows/macos.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d9b4d829f..787f9a00e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -21,6 +21,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 @@ -39,10 +43,7 @@ jobs: continue-on-error: true - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: make clean run: make clean @@ -61,6 +62,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 @@ -79,10 +84,7 @@ jobs: continue-on-error: true - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: make clean run: make clean @@ -102,6 +104,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Set Git http.postBuffer to something high run: git config --global http.postBuffer 524288000 @@ -120,10 +126,7 @@ jobs: continue-on-error: true - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: Prepare Build Folders run: | From 9d33646b8047c90eaeb331afc3c83d8b84d61172 Mon Sep 17 00:00:00 2001 From: Henry Gabryjelski Date: Sun, 5 May 2024 18:27:35 -0700 Subject: [PATCH 2/4] Disable broken hitag2 test so github actions work --- tools/pm3_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pm3_tests.sh b/tools/pm3_tests.sh index 782c561c9..180763c7a 100755 --- a/tools/pm3_tests.sh +++ b/tools/pm3_tests.sh @@ -414,7 +414,7 @@ while true; do if ! CheckExecute "nfc decode test - signature" "$CLIENTBIN -c 'nfc decode -d 03FF010194113870696C65742E65653A656B616172743A3266195F26063132303832325904202020205F28033233335F2701316E1B5A13333038363439303039303030323636343030355304EBF2CE704103000000AC536967010200803A2448FCA7D354A654A81BD021150D1A152D1DF4D7A55D2B771F12F094EAB6E5E10F2617A2F8DAD4FD38AFF8EA39B71C19BD42618CDA86EE7E144636C8E0E7CFC4096E19C3680E09C78A0CDBC05DA2D698E551D5D709717655E56FE3676880B897D2C70DF5F06ECE07C71435255144F8EE41AF110E7B180DA0E6C22FB8FDEF61800025687474703A2F2F70696C65742E65652F6372742F33303836343930302D303030312E637274FE'" "30864900-0001.crt"; then break; fi echo -e "\n${C_BLUE}Testing LF:${C_NC}" - if ! CheckExecute "lf hitag2 test" "$CLIENTBIN -c 'lf hitag selftest'" "Tests \( ok"; then break; fi + # if ! CheckExecute "lf hitag2 test" "$CLIENTBIN -c 'lf hitag selftest'" "Tests \( ok"; then break; fi if ! CheckExecute "lf cotag demod test" "$CLIENTBIN -c 'data load -f traces/lf_cotag_220_8331.pm3; data norm; data cthreshold -u 50 -d -20; data envelope; data raw --ar -c 272; lf cotag demod'" \ "COTAG Found: FC 220, CN: 8331 Raw: FFB841170363FFFE00001E7F00000000"; then break; fi if ! CheckExecute "lf AWID test" "$CLIENTBIN -c 'data load -f traces/lf_AWID-15-259.pm3;lf search -1'" "AWID ID found"; then break; fi From 7712acff64a841575d1e480629eaf60854bb787d Mon Sep 17 00:00:00 2001 From: Henry Gabryjelski Date: Sun, 5 May 2024 18:35:38 -0700 Subject: [PATCH 3/4] Use `actions/setup-python` for Ubuntu also --- .github/workflows/ubuntu.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2ce8b33e7..dd0d5d57b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -22,6 +22,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Update apt repos run: sudo apt-get update @@ -29,11 +33,7 @@ jobs: 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 liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools - python3 -m pip install ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: make clean run: make clean @@ -52,6 +52,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Update apt repos run: sudo apt-get update @@ -59,11 +63,7 @@ jobs: 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 liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools - python3 -m pip install ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: make clean run: make clean @@ -83,6 +83,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Update apt repos run: sudo apt-get update @@ -90,11 +94,7 @@ jobs: 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 liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools - python3 -m pip install ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: Prepare Build Folders run: | From c40f4be3e6b17964b5c21d64a666a95d778dec6b Mon Sep 17 00:00:00 2001 From: Henry Gabryjelski Date: Mon, 6 May 2024 07:59:41 -0700 Subject: [PATCH 4/4] re-enable broken hitag2 test --- tools/pm3_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pm3_tests.sh b/tools/pm3_tests.sh index 180763c7a..2af52987d 100755 --- a/tools/pm3_tests.sh +++ b/tools/pm3_tests.sh @@ -414,7 +414,7 @@ while true; do if ! CheckExecute "nfc decode test - signature" "$CLIENTBIN -c 'nfc decode -d 03FF010194113870696C65742E65653A656B616172743A3266195F26063132303832325904202020205F28033233335F2701316E1B5A13333038363439303039303030323636343030355304EBF2CE704103000000AC536967010200803A2448FCA7D354A654A81BD021150D1A152D1DF4D7A55D2B771F12F094EAB6E5E10F2617A2F8DAD4FD38AFF8EA39B71C19BD42618CDA86EE7E144636C8E0E7CFC4096E19C3680E09C78A0CDBC05DA2D698E551D5D709717655E56FE3676880B897D2C70DF5F06ECE07C71435255144F8EE41AF110E7B180DA0E6C22FB8FDEF61800025687474703A2F2F70696C65742E65652F6372742F33303836343930302D303030312E637274FE'" "30864900-0001.crt"; then break; fi echo -e "\n${C_BLUE}Testing LF:${C_NC}" - # if ! CheckExecute "lf hitag2 test" "$CLIENTBIN -c 'lf hitag selftest'" "Tests \( ok"; then break; fi + if ! CheckExecute "lf hitag2 test" "$CLIENTBIN -c 'lf hitag test'" "Tests \( ok"; then break; fi if ! CheckExecute "lf cotag demod test" "$CLIENTBIN -c 'data load -f traces/lf_cotag_220_8331.pm3; data norm; data cthreshold -u 50 -d -20; data envelope; data raw --ar -c 272; lf cotag demod'" \ "COTAG Found: FC 220, CN: 8331 Raw: FFB841170363FFFE00001E7F00000000"; then break; fi if ! CheckExecute "lf AWID test" "$CLIENTBIN -c 'data load -f traces/lf_AWID-15-259.pm3;lf search -1'" "AWID ID found"; then break; fi