Unverified Commit 447b29d0 authored by yaya's avatar yaya Committed by GitHub
Browse files

gitlab-runner: 18.8.0 -> 18.9.0 (#501023)

parents d7aeb764 c87616c7

pkgs/by-name/gi/gitlab-runner/package.nix

+6 −3
Original line number Diff line number Diff line
@@ -6,20 +6,21 @@ 
  fetchFromGitLab,

  nix-update-script,

  versionCheckHook,

  writableTmpDirAsHomeHook,

}:



buildGoModule (finalAttrs: {

  pname = "gitlab-runner";

  version = "18.8.0";

  version = "18.9.0";



  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-runner";

    tag = "v${finalAttrs.version}";

    hash = "sha256-rS7+BUdec+Z4G/dd5D/NHe3gbELWicg0Nmgx4zJAIX4=";

    hash = "sha256-U13SouwEfCVy5M8fv6rkCX0F+ecVYdsocvAdt3yxPJA=";

  };



  vendorHash = "sha256-Br9TW+sg7PDOE2d8lVQ9Xv9+UD7JHzitdTOcyodHr+s=";

  vendorHash = "sha256-Ak1Q8FnTD8LKcN9xRc1gpcnUiambGC3CJP84cwQqTtM=";



  # For patchShebangs

  buildInputs = [ bash ];
@@ -85,6 +86,8 @@ buildGoModule (finalAttrs: { 
      "-X ${ldflagsPackageVariablePrefix}.REVISION=v${finalAttrs.version}"

    ];



  nativeCheckInputs = [ writableTmpDirAsHomeHook ];



  preCheck = ''

    # Make the tests pass outside of GitLab CI

    export CI=0

pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch

+4 −4
Original line number Diff line number Diff line 
diff --git a/shells/bash_test.go b/shells/bash_test.go

index 9ed9e65ff..02b6e6d5f 100644

index bbbe949f4..955992d3f 100644

--- a/shells/bash_test.go

+++ b/shells/bash_test.go

@@ -4,11 +4,9 @@ package shells
@@ -11,10 +11,10 @@ index 9ed9e65ff..02b6e6d5f 100644 
 

 	"github.com/stretchr/testify/assert"

-	"github.com/stretchr/testify/require"

 	"gitlab.com/gitlab-org/gitlab-runner/common"

 )

 

@@ -90,65 +88,6 @@ func TestBash_CheckForErrors(t *testing.T) {

 	"gitlab.com/gitlab-org/gitlab-runner/common"

 	"gitlab.com/gitlab-org/gitlab-runner/common/spec"

@@ -78,65 +76,6 @@ func TestBash_CheckForErrors(t *testing.T) {

 	}

 }