From 4a96679d43cfdcf7b6af247486eb7aed28981d32 Mon Sep 17 00:00:00 2001 From: James Couball Date: Wed, 17 Aug 2022 12:19:58 -0700 Subject: [PATCH 1/2] Fix windows build (#591) Signed-off-by: James Couball --- tests/units/test_lib.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb index bdf50a75..71acd21e 100644 --- a/tests/units/test_lib.rb +++ b/tests/units/test_lib.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../test_helper' +require "fileutils" # tests all the low level git communication # @@ -51,8 +52,13 @@ def test_commit_with_no_verify move_file(pre_commit_path, pre_commit_path_bak) # Adds a pre-commit file that should throw an error - create_file(pre_commit_path, 'echo Pre-commit file. Shoud not execute; exit 1') # Error when executed - File.chmod(0111, pre_commit_path) + create_file(pre_commit_path, <<~PRE_COMMIT_SCRIPT) + #!/bin/sh + echo "pre-commit script exits with an error" + exit 1 + PRE_COMMIT_SCRIPT + + FileUtils.chmod("+x", pre_commit_path) create_file("#{@wdir}/test_file_2", 'content test_file_2') @lib.add('test_file_2') From 609ab8be2656c2362f126863dc2c98255fb5f68a Mon Sep 17 00:00:00 2001 From: James Couball Date: Wed, 17 Aug 2022 12:30:21 -0700 Subject: [PATCH 2/2] Allow the CI build to be run manually using the GitHub interface (#590) Signed-off-by: James Couball --- .github/workflows/continuous_integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index c6599412..34dd49a6 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -5,6 +5,7 @@ on: branches: [master] pull_request: branches: [master] + workflow_dispatch: jobs: continuous_integration_build: