From 59007dc62613690b98e673429ba24376296a805a Mon Sep 17 00:00:00 2001 From: AntoineGautier Date: Thu, 14 Sep 2023 08:09:15 +0200 Subject: [PATCH 1/2] Git ignore results from test_bin --- .gitignore | 1 + tests/test_bin/results/errors.csv | 22 ---------------------- tests/test_bin/results/lowerBound.csv | 19 ------------------- tests/test_bin/results/reference.csv | 22 ---------------------- tests/test_bin/results/test.csv | 22 ---------------------- tests/test_bin/results/upperBound.csv | 18 ------------------ 6 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 tests/test_bin/results/errors.csv delete mode 100644 tests/test_bin/results/lowerBound.csv delete mode 100644 tests/test_bin/results/reference.csv delete mode 100644 tests/test_bin/results/test.csv delete mode 100644 tests/test_bin/results/upperBound.csv diff --git a/.gitignore b/.gitignore index 7ca1fa47..f541cdb8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # Tests outputs tests/**/*.html tests/test_numerics*/ +tests/test_bin/results/* # Generated by CMake DartConfiguration.tcl diff --git a/tests/test_bin/results/errors.csv b/tests/test_bin/results/errors.csv deleted file mode 100644 index 3f5034ee..00000000 --- a/tests/test_bin/results/errors.csv +++ /dev/null @@ -1,22 +0,0 @@ -x,y -0,0 -0.05,0 -0.1,0 -0.15,0 -0.2,0 -0.25,0 -0.3,0 -0.35,0 -0.4,0 -0.45,0 -0.5,0 -0.55,0 -0.6,0 -0.65,0 -0.7,0 -0.75,0 -0.8,0 -0.85,0 -0.9,0 -0.95,0 -1,0 diff --git a/tests/test_bin/results/lowerBound.csv b/tests/test_bin/results/lowerBound.csv deleted file mode 100644 index afe5de4d..00000000 --- a/tests/test_bin/results/lowerBound.csv +++ /dev/null @@ -1,19 +0,0 @@ -x,y --0.002,-0.002 -0.052,-0.002 -0.102,0.998 -0.198,0.998 -0.248,-0.002 -0.252,-0.002 -0.302,2.998 -0.348,2.998 -0.398,-0.002 -0.452,-0.002 -0.502,3.998 -0.548,3.998 -0.598,-0.002 -0.652,-0.002 -0.702,0.498 -0.748,0.498 -0.798,-0.002 -1.002,-0.002 diff --git a/tests/test_bin/results/reference.csv b/tests/test_bin/results/reference.csv deleted file mode 100644 index 134e23ce..00000000 --- a/tests/test_bin/results/reference.csv +++ /dev/null @@ -1,22 +0,0 @@ -x,y -0,0 -0.05,0 -0.1,1 -0.15,1 -0.2,1 -0.25,0 -0.3,3 -0.35,3 -0.4,0 -0.45,0 -0.5,4 -0.55,4 -0.6,0 -0.65,0 -0.7,0.5 -0.75,0.5 -0.8,0 -0.85,0 -0.9,0 -0.95,0 -1,0 diff --git a/tests/test_bin/results/test.csv b/tests/test_bin/results/test.csv deleted file mode 100644 index 134e23ce..00000000 --- a/tests/test_bin/results/test.csv +++ /dev/null @@ -1,22 +0,0 @@ -x,y -0,0 -0.05,0 -0.1,1 -0.15,1 -0.2,1 -0.25,0 -0.3,3 -0.35,3 -0.4,0 -0.45,0 -0.5,4 -0.55,4 -0.6,0 -0.65,0 -0.7,0.5 -0.75,0.5 -0.8,0 -0.85,0 -0.9,0 -0.95,0 -1,0 diff --git a/tests/test_bin/results/upperBound.csv b/tests/test_bin/results/upperBound.csv deleted file mode 100644 index c207fcbb..00000000 --- a/tests/test_bin/results/upperBound.csv +++ /dev/null @@ -1,18 +0,0 @@ -x,y --0.002,0.002 -0.048,0.002 -0.098,1.002 -0.202,1.002 -0.249,0.06199999999999956 -0.298,3.002 -0.352,3.002 -0.402,0.002 -0.448,0.002 -0.498,4.002 -0.552,4.002 -0.602,0.002 -0.648,0.002 -0.698,0.502 -0.752,0.502 -0.802,0.002 -1.002,0.002 From 2a610996753aac4e0f1b349e9d75778f7ef2e23d Mon Sep 17 00:00:00 2001 From: AntoineGautier Date: Thu, 14 Sep 2023 08:24:03 +0200 Subject: [PATCH 2/2] Push only if diff w/ HEAD --- .github/workflows/cmake.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index fb5e35cc..6df4aac2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -82,6 +82,4 @@ jobs: git config --global user.email $GH_USERNAME@users.noreply.github.com git config --global pull.rebase false git add ${{ github.workspace }}/pyfunnel/lib - git diff-index --quiet HEAD || git commit -m "Add ${{ matrix.os }} binaries" - git pull - git push + git diff-index --quiet HEAD || { git commit -m "Add ${{ matrix.os }} binaries" && git pull && git push; }