From 4a861c376e435aa6f420dcb7548a5772d680fe32 Mon Sep 17 00:00:00 2001 From: Karl Ding Date: Mon, 13 Mar 2023 23:13:27 -0700 Subject: [PATCH] Manually order expected sample comparison file It appears that the GitHub Actions runner is returning the glob path results in a different ordering than the ordering obtained when locally running the compare_all.sh script. This difference in the ordering causes CI to fail due to differences to the generated expectation file. This also seems to have been an issue in previous PRs---the solution here is likely to sort the output before processing or figure out what shell options cause the difference in glob ordering, and explicitly set those in the shell script to eliminate the difference (or prevent the script from inheriting anything but shell defaults). For now, try reordering the output by hand to match the ordering the GitHub Action runner likely expects. --- sample_files/compare.expected | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sample_files/compare.expected b/sample_files/compare.expected index d4b09729b..77136a539 100644 --- a/sample_files/compare.expected +++ b/sample_files/compare.expected @@ -1,6 +1,3 @@ -sample_files/Session_before.kt sample_files/Session_after.kt -9def134da4bbc423a1fde93001618776 - - sample_files/ada_before.adb sample_files/ada_after.adb a3b2b5033fde04bf9d2d71cb56d9eade - @@ -64,12 +61,12 @@ sample_files/haskell_before.hs sample_files/haskell_after.hs sample_files/hcl_before.hcl sample_files/hcl_after.hcl 24c6205befd0fd1b44f21dd039cafb48 - -sample_files/helpful-unit-test-before.el sample_files/helpful-unit-test-after.el -ce09e8127c21b8c186cd8a2143035b28 - - sample_files/helpful_before.el sample_files/helpful_after.el 65ad6cb40353750f05d183f9276930b6 - +sample_files/helpful-unit-test-before.el sample_files/helpful-unit-test-after.el +ce09e8127c21b8c186cd8a2143035b28 - + sample_files/html_before.html sample_files/html_after.html a84fc473494c982bb1c0fb8ad9f1e84f - @@ -163,18 +160,21 @@ sample_files/preprocesor_before.h sample_files/preprocesor_after.h sample_files/qml_before.qml sample_files/qml_after.qml 622951bb34dbae3e35acd72d712bf127 - -sample_files/r_before.R sample_files/r_after.R -7a9bc4e3ba87b6f2139a6cdadcc7ee5f - - sample_files/racket_before.rkt sample_files/racket_after.rkt 37b30401886359735b9bc43518361945 - +sample_files/r_before.R sample_files/r_after.R +7a9bc4e3ba87b6f2139a6cdadcc7ee5f - + sample_files/ruby_before.rb sample_files/ruby_after.rb db81701f87486b18f99d326d028d9929 - sample_files/scala_before.scala sample_files/scala_after.scala 4cb631c1114a51399381aff144300019 - +sample_files/Session_before.kt sample_files/Session_after.kt +9def134da4bbc423a1fde93001618776 - + sample_files/simple_before.js sample_files/simple_after.js 43feeac1f3afe2c0c0b862009770f27a -