Merge pull request #131936 from NixOS/backport-131091-to-release-21.05
[Backport release-21.05] github-runner: 2.278.0 -> 2.279.0
This commit is contained in:
commit
04cd79393b
|
@ -20,7 +20,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "github-actions-runner";
|
||||
version = "2.278.0";
|
||||
version = "2.279.0";
|
||||
|
||||
deps = (import ./deps.nix { inherit fetchurl; });
|
||||
nugetPackages = map
|
||||
|
@ -41,6 +41,10 @@ let
|
|||
# Online tests
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
|
||||
[
|
||||
"CompositeActionWithActionfile_CompositeContainerNested"
|
||||
"CompositeActionWithActionfile_CompositePrestepNested"
|
||||
"CompositeActionWithActionfile_MaxLimit"
|
||||
"CompositeActionWithActionfile_Node"
|
||||
"DownloadActionFromGraph"
|
||||
"DownloadActionFromGraph_Legacy"
|
||||
"NotPullOrBuildImagesMultipleTimes"
|
||||
|
@ -80,8 +84,8 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version}
|
||||
sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c=";
|
||||
rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version}
|
||||
sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -123,6 +127,11 @@ stdenv.mkDerivation rec {
|
|||
--replace 'dotnet test Test/Test.csproj' \
|
||||
"dotnet test Test/Test.csproj --filter '${testFilterXml}'"
|
||||
|
||||
# We don't use a Git checkout
|
||||
substituteInPlace src/dir.proj \
|
||||
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
|
||||
'echo Patched out.'
|
||||
|
||||
# Fix FHS path
|
||||
substituteInPlace src/Test/L0/Util/IOUtilL0.cs \
|
||||
--replace '/bin/ln' '${coreutils}/bin/ln'
|
||||
|
|
Loading…
Reference in New Issue