Skip to content

Commit b9a3f00

Browse files
committed
Revert "ci: run clear-signing reports on fork branch"
This reverts commit 2b34e67.
1 parent 2b34e67 commit b9a3f00

1 file changed

Lines changed: 3 additions & 16 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ jobs:
1111
- run:
1212
name: Clone python-keepkey (current branch)
1313
command: |
14-
PYKK_REPO="https://github.com/${CIRCLE_PROJECT_USERNAME:-BitHighlander}/${CIRCLE_PROJECT_REPONAME:-python-keepkey}.git"
15-
git clone --depth 1 -b "$CIRCLE_BRANCH" "$PYKK_REPO" .pykk
14+
git clone --depth 1 -b "$CIRCLE_BRANCH" https://github.com/keepkey/python-keepkey.git .pykk
1615
cd .pykk && git submodule update --init --recursive
1716
1817
# ────────────────────────────────────────────────────────────────
@@ -28,11 +27,8 @@ jobs:
2827
# Move python-keepkey out of the way
2928
mv .pykk ../
3029
31-
# Clone firmware repository. The Zcash clear-signing test branch
32-
# needs the matching firmware branch unless CI overrides it.
33-
FIRMWARE_REPO="${FIRMWARE_REPO:-https://github.com/BitHighlander/keepkey-firmware.git}"
34-
FIRMWARE_BRANCH="${FIRMWARE_BRANCH:-feature/clearsign-txs}"
35-
git clone --depth 1 -b "$FIRMWARE_BRANCH" "$FIRMWARE_REPO" .
30+
# Clone firmware repository (expects $FIRMWARE_REPO env var)
31+
git clone --depth 1 -b master "$FIRMWARE_REPO" .
3632
3733
# Initialise firmware submodules
3834
git submodule update --init --recursive
@@ -61,21 +57,12 @@ jobs:
6157
docker cp "$(docker-compose ps -q python-keepkey)":/kkemu/test-reports/. ../../test-reports/
6258
popd
6359
64-
# Build the combined PDF from JUnit + captured OLED frames.
65-
FW_VERSION="${FW_VERSION:-7.15.0}" python3 scripts/generate-test-report.py || true
66-
6760
# Fail job if either container reported non-zero status
6861
[ "$(cat test-reports/python-keepkey/status)$(cat test-reports/firmware-unit/status)" = "00" ] || exit 1
6962
7063
- store_test_results:
7164
path: test-reports
7265

73-
- store_artifacts:
74-
path: test-report.pdf
75-
76-
- store_artifacts:
77-
path: test-reports
78-
7966
# ──────────────────────────────────────────────────────────────────────
8067
workflows:
8168
version: 2

0 commit comments

Comments
 (0)