diff options
author | Alex Martens <alex@thinglab.org> | 2022-05-23 08:50:40 -0700 |
---|---|---|
committer | Alex Martens <alex@thinglab.org> | 2022-05-23 08:50:40 -0700 |
commit | 36fbecf10917959e538a81512684510d1efe94b0 (patch) | |
tree | 66a8f2910caa17ad9ed53707e7f7d3c2efb36c06 | |
parent | 608d5958555705f7d2e04a3bfd8ee680cde89d47 (diff) | |
download | nixpkgs-36fbecf10917959e538a81512684510d1efe94b0.tar nixpkgs-36fbecf10917959e538a81512684510d1efe94b0.tar.gz nixpkgs-36fbecf10917959e538a81512684510d1efe94b0.tar.bz2 nixpkgs-36fbecf10917959e538a81512684510d1efe94b0.tar.lz nixpkgs-36fbecf10917959e538a81512684510d1efe94b0.tar.xz nixpkgs-36fbecf10917959e538a81512684510d1efe94b0.tar.zst nixpkgs-36fbecf10917959e538a81512684510d1efe94b0.zip |
github-runner: 2.291.1 -> 2.292.0
-rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index abd77dd1f4a..8718cd8dc80 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.291.1"; + version = "2.292.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-0Eijq2vXY+Y2g3bhEhIGnFxTCLXpw7k3iXpgj3x8nL4="; + hash = "sha256-vmHUu4coAxFLfi+G4xLjy3+LzFnmGllhWhCXcWuDQnc="; }; nativeBuildInputs = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { postPatch = '' # Relax the version requirement substituteInPlace src/global.json \ - --replace '6.0.100' '${dotnetSdk.version}' + --replace '6.0.300' '${dotnetSdk.version}' # Disable specific tests substituteInPlace src/dir.proj \ diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch index 9a75b12544a..2bfda30e324 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch @@ -35,7 +35,7 @@ index 1c91e0c..8b27d3f 100644 <Target Name="Test" DependsOnTargets="GenerateConstant"> - <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" /> -- <Exec Command="dotnet test Test/Test.csproj --no-build --logger:trx" ConsoleToMSBuild="true" /> +- <Exec Command="dotnet test Test/Test.csproj -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" /> + <Exec Command="dotnet build Test/Test.csproj --no-restore -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" /> + <Exec Command="dotnet test Test/Test.csproj --no-restore --no-build --logger:trx" ConsoleToMSBuild="true" /> </Target> |