From 6d1c02b2bca20efe094418d823060c01482b3966 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 18 Sep 2022 14:20:21 +0200 Subject: [PATCH] Update nextion2text.yml --- .github/workflows/nextion2text.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index 631efcbc..cc927519 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -35,7 +35,7 @@ jobs: - name: Download n2t continue-on-error: true run: | - wget https://raw.githubusercontent.com/joBr99/Nextion2Text/master/linux/Nextion2Text.py + wget https://raw.githubusercontent.com/joBr99/Nextion2Text/master/linux/Nextion2Text.py && apt install -y diffoscope - name: Run n2t EU continue-on-error: true @@ -56,20 +56,22 @@ jobs: echo portrait python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out - diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt + diffoscope --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt + #diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt - name: Run n2t US P DIFF DIFF continue-on-error: true run: | - diff -u HMI/US/portrait/diff-eu-version-known-good.txt HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt + diffoscope --exclude-directory-metadata=recursive HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt + #diff -u HMI/US/portrait/diff-eu-version-known-good.txt HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt - name: Run n2t US L DIFF continue-on-error: true run: | echo landscape python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out - diff -bur HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt - + #diff -bur HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt + diffoscope --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt - name: Display txt files continue-on-error: true