Merge pull request #2305 from znz/fix-ci-error-on-windows

Fix CI errors on windows
rurema · Jun 30, 2020 · 61b3a9d · 61b3a9d
2 parents 26f8a95 + 5eccbbf
commit 61b3a9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,8 +60,8 @@ jobs:
       run: |
         cd /tmp
         mv -v html html.base
-        git diff --no-index html.base html.pr --stat || :
-        git diff --no-index html.base html.pr --output artifact/html.diff || :
+        git diff --no-index html.base html.pr --stat || true
+        git diff --no-index html.base html.pr --output artifact/html.diff || true
     - uses: actions/upload-artifact@v2
       with:
         name: diff-${{ matrix.os }}-${{ matrix.ruby }}

diff --git a/Rakefile b/Rakefile
@@ -4,6 +4,11 @@ UNRELEASED_VERSIONS = %w[2.8.0]
 ALL_VERSIONS = [*OLD_VERSIONS, *SUPPORTED_VERSIONS, *UNRELEASED_VERSIONS]
 HTML_DIRECTORY_BASE = ENV.fetch("HTML_DIRECTORY_BASE", "/tmp/html/")
 
+def system(*commands)
+  puts "Running #{commands.join(' ')}..."
+  super(*commands)
+end
+
 def generate_database(version)
   puts "generate database of #{version}"
   db = "/tmp/db-#{version}"