From 54199e43aea6bc2f48356380f7319ac9216c3bae Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 14 Mar 2024 22:09:04 +0100 Subject: [PATCH] ci: actions: primitive icons for UI diff comments [skip_ci] --- .github/actions/ui-report/action.yml | 10 ++++++++++ .github/actions/ui-report/failure.png | Bin 0 -> 1322 bytes .github/actions/ui-report/success.png | Bin 0 -> 1467 bytes .github/workflows/core.yml | 19 ++++++++++++++----- .github/workflows/legacy.yml | 11 +++++++++-- 5 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 .github/actions/ui-report/failure.png create mode 100644 .github/actions/ui-report/success.png diff --git a/.github/actions/ui-report/action.yml b/.github/actions/ui-report/action.yml index c916d0fa6..1f2a7074a 100644 --- a/.github/actions/ui-report/action.yml +++ b/.github/actions/ui-report/action.yml @@ -4,6 +4,10 @@ inputs: model: description: 'Internal model name' required: true + status: + description: 'Either "success" or "failure"' + required: false + default: "failure" runs: using: composite steps: @@ -22,6 +26,12 @@ runs: mv tests/trezor.log $OUTDIR || true diff -u tests/ui_tests/fixtures.json tests/ui_tests/fixtures.suggestion.json || true tar -cf screens_$MODELJOB.tar tests/ui_tests/screens || true + + if [ "${{ inputs.status }}" = "success" ]; then + cp .github/actions/ui-report/success.png $OUTDIR/status.png + else + cp .github/actions/ui-report/failure.png $OUTDIR/status.png + fi shell: sh - name: Upload report run: | diff --git a/.github/actions/ui-report/failure.png b/.github/actions/ui-report/failure.png new file mode 100644 index 0000000000000000000000000000000000000000..f65202a83bd12d358107d49eb70a82890faf3ec8 GIT binary patch literal 1322 zcmZvaeN5I>6vxl=0I4YO2fi#Zar%Q%D;w(pG#>=nLvW@cHGN35)`;F5CDQO)%B`b=X%FXyP55G4sHPOgYNz!P{M=U}RHW;?kQZ<95PA{HdJ zkib&Yyapq5lHEX}rez?DCRRwM2MiWXE!X=-SPLmeF`YvoQ|HvzfH1W`MkFW(Auz`^ zhyoTMHqTZxurdAnt9Qp<~@1ETa?`Jq$X0Q5SZ6ckx_=)FIp`&!P z?cTQCl+@w8Gx+RZdrs|M*mA>tr2NmHzT37TC}%J{=W<2UyDMrJ-H*Tf{PD;$hgKik z7qNd?R{byjp)a)6Y3HbN45sXGUnteJ-S)EF-?xSxcf`IIm({!a%aEr^{&n2gxiPe> z;jMGI_MW`xqk~O2FTcIKr@1xQd3N#l=>>g9kG*mw`-iaPp{iM1>mpV)Cf_e{L>I+W zdoINF7QvjR!|yaimw7tNJk^OSUw6be$M&au^~cWWWj0xoWj~d$_@y{c@tDo;^PGZ# z+YbXFz2@iqrD^9qd9Cds+xvigCm^Xa9r$}e0YAHEzl+Om9) XUqE9}`@qccMsMdaIn8x0DR=LGWWQ{u literal 0 HcmV?d00001 diff --git a/.github/actions/ui-report/success.png b/.github/actions/ui-report/success.png new file mode 100644 index 0000000000000000000000000000000000000000..7513721c2c028fa35d7ef35385990fc5ea34af9d GIT binary patch literal 1467 zcmZuw4NTQl6u%GA9yUJ3L50EWG6?xl_7q4*z#zEd5DaZdOOucUZb-!o1_mLpL|(uF z8WCs%nwWrOa2XkidqmA=@xsBBTgrzBVj@#QNb+_cZjO)ccJDpszjN;IcYf#mkA;T? zo34I-HA2Xggaq!Ax3ys_jpS)`Cx0(OD^U23$RO#8`7P!zAw6MOoO8w)08mN^AsAzh z5JLzMq6iU$u*_QaiF3pl0zi}^LJ*iB7?36Ya`A*Edz?GXjE94ur|h5kzI3 zi>HC0#r=^a5eLL5lHmd|j({Nwa%`DEz$FDFf#z4Yi;=PXBh)0&Khj%QRuZ~nO@wt` zcYD?CsS*99aEpzWxSD^4#he5V)=t#Z=!07=F)Iw@!bxqBD17@kN()GIUU)5c+11DqO?}XI7{JoP1P{i z=8@C!0XgTO6ib8B~3B*v+Y)jlEHJ z%JtiSdHQJchP4R~tfqI_21ob4(wDB~F|{hApjWSFdTKTYYs+g=kj2hBFXWx{wM%nz z>8a4VpKQJOXKd|M#??%(Q`P#)=|cC6hNk|mSoe_Zh_4guj;J%o%Ibbm?tg2_>&UpV zPiN@G{?h7irmW^hdz`&>rGGj5zBlZd8l{i<+vlTToj%mRxN7)brEhC~QPuY|ultOc z>{VA;zhobic<5F}X7t0koKg&Q+`ow`<$2d1ThGPZ1D;Roy+8b04#b zS(BsrCeEHmoBVFp98CD&(7K;(`*M@9$_Vq)_rIGd*XSm7>(5k2DiuGy=~_2nt9@;A zN9NW~m07)|L(YvY$zSLOd;PrimDFQ [test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/master_diff.html)) | [test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/master_diff.html)) | [test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/master_diff.html))|| + |T2B1 Safe 3 |[3280](https://github.com/trezor/trezor-firmware/issues/3280) | [test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/master_diff.html)) |[2724](https://github.com/trezor/trezor-firmware/issues/2724) || + |T3T1 | [test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_device_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_device_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_device_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_device_test/master_diff.html)) | [test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_click_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_click_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_click_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_click_test/master_diff.html)) | [test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_persistence_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_persistence_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_persistence_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T3T1-core_persistence_test/master_diff.html))|| + |All | [main](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/index.html)([screens](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/master_diff.html)) || jobs: param: @@ -251,6 +251,7 @@ jobs: - uses: ./.github/actions/ui-report with: model: ${{ matrix.model }} + status: ${{ job.status }} if: ${{ always() && env.ACTIONS_DO_UI_TEST == 'true' }} continue-on-error: true - uses: ./.github/actions/ui-comment @@ -304,6 +305,7 @@ jobs: - uses: ./.github/actions/ui-report with: model: ${{ matrix.model }} + status: ${{ job.status }} if: always() continue-on-error: true - run: mv core/src/.coverage core/.coverage.test_click || true @@ -377,6 +379,7 @@ jobs: - uses: ./.github/actions/ui-report with: model: ${{ matrix.model }} + status: ${{ job.status }} if: always() continue-on-error: true - run: mv core/src/.coverage core/.coverage.test_persistence || true @@ -679,7 +682,13 @@ jobs: continue-on-error: true - run: "for F in screens_*.tar; do tar xvf $F; done || true" - run: nix-shell --run "poetry run python -m tests.ui_tests.reporting master-diff TT TR" - - run: mv tests/ui_tests/reports/master_diff . + - run: | + mv tests/ui_tests/reports/master_diff . + if [ "${{ job.status }}" = "success" ]; then + cp .github/actions/ui-report/success.png master_diff/status.png + else + cp .github/actions/ui-report/failure.png master_diff/status.png + fi - name: Upload diff from main branch run: | aws s3 sync master_diff s3://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }} diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml index d836e862b..e6c40aeab 100644 --- a/.github/workflows/legacy.yml +++ b/.github/workflows/legacy.yml @@ -11,7 +11,7 @@ permissions: env: PULL_COMMENT: | - |legacy UI changes|[device test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T1B1-legacy_device_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T1B1-legacy_device_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/)([screens](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/master_diff.html))| + |legacy UI changes| [device test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T1B1-legacy_device_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T1B1-legacy_device_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/)([screens](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/master_diff.html))| |-----------------|-----| jobs: @@ -97,6 +97,7 @@ jobs: - uses: ./.github/actions/ui-report with: model: T1B1 + status: ${{ job.status }} continue-on-error: true if: ${{ always() && matrix.coins == 'universal' }} - uses: ./.github/actions/ui-comment @@ -167,7 +168,13 @@ jobs: continue-on-error: true - run: "for F in screens_*.tar; do tar xvf $F; done || true" - run: nix-shell --run "poetry run python -m tests.ui_tests.reporting master-diff T1" - - run: mv tests/ui_tests/reports/master_diff . + - run: | + mv tests/ui_tests/reports/master_diff . + if [ "${{ job.status }}" = "success" ]; then + cp .github/actions/ui-report/success.png master_diff/status.png + else + cp .github/actions/ui-report/failure.png master_diff/status.png + fi - name: Upload main branch diff run: | aws s3 sync master_diff s3://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}