From 6bd39fba88c4a2e7999f9ac6fb326eeeb365c4b3 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 8 Aug 2021 23:24:48 +0000 Subject: [PATCH] Automatically run diffoscope on changed compressed files in CI --- .github/workflows/build.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 708f570e..eb394b08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,7 +102,15 @@ jobs: cp ldk-java.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" cp ldk-java-classes.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" cd ldk-java-bins - git diff --exit-code + if ! git diff --exit-code; then + mv "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"* ./ + git checkout "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" + apt-get -y install diffoscope + diffoscope ldk-java-sources.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-sources.jar" + diffoscope ldk-java-classes.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-classes.jar" + diffoscope ldk-java.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java.jar" + exit 1 + fi android: runs-on: ubuntu-latest @@ -183,7 +191,13 @@ jobs: rm "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" cp LDK-release.aar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" cd ldk-java-bins - git diff --exit-code + if ! git diff --exit-code; then + mv "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" ./ + git checkout "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" + apt-get -y install diffoscope + diffoscope LDK-release.aar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" + exit 1 + fi osx: strategy: -- 2.30.2