Monorepo for Tangled tangled.org

nix,spindle: sync workflow files on sh.tangled.git.refUpdate #984

open opened by boltless.me targeting master from sl/spindle-rewrite
Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:xasnlahkri4ewmbuzly2rlc5/sh.tangled.repo.pull/3mckguakfc422
+8 -8
Interdiff #3 #4
go.mod

This file has not been changed.

+2 -2
go.sum
··· 265 265 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= 266 266 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw= 267 267 github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw= 268 - github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4= 269 - github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 270 268 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= 271 269 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= 272 270 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= ··· 298 296 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= 299 297 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw= 300 298 github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw= 299 + github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4= 300 + github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 301 301 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= 302 302 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= 303 303 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+3 -3
nix/gomod2nix.toml
··· 304 304 [mod."github.com/hashicorp/go-sockaddr"] 305 305 version = "v1.0.7" 306 306 hash = "sha256-p6eDOrGzN1jMmT/F/f/VJMq0cKNFhUcEuVVwTE6vSrs=" 307 - [mod."github.com/hashicorp/go-version"] 308 - version = "v1.8.0" 309 - hash = "sha256-KXtqERmYrWdpqPCViWcHbe6jnuH7k16bvBIcuJuevj8=" 310 307 [mod."github.com/hashicorp/golang-lru"] 311 308 version = "v1.0.2" 312 309 hash = "sha256-yy+5botc6T5wXgOe2mfNXJP3wr+MkVlUZ2JBkmmrA48=" ··· 317 314 [mod."github.com/hashicorp/go-sockaddr"] 318 315 version = "v1.0.7" 319 316 hash = "sha256-p6eDOrGzN1jMmT/F/f/VJMq0cKNFhUcEuVVwTE6vSrs=" 317 + [mod."github.com/hashicorp/go-version"] 318 + version = "v1.8.0" 319 + hash = "sha256-KXtqERmYrWdpqPCViWcHbe6jnuH7k16bvBIcuJuevj8=" 320 320 [mod."github.com/hashicorp/golang-lru"] 321 321 version = "v1.0.2" 322 322 hash = "sha256-yy+5botc6T5wXgOe2mfNXJP3wr+MkVlUZ2JBkmmrA48="
+3 -3
nix/modules/spindle.nix
··· 133 133 description = "spindle service"; 134 134 after = ["network.target" "docker.service"]; 135 135 wantedBy = ["multi-user.target"]; 136 + path = [ 137 + pkgs.git 138 + ]; 136 139 serviceConfig = { 137 140 LogsDirectory = "spindle"; 138 141 StateDirectory = "spindle"; ··· 146 149 description = "spindle service"; 147 150 after = ["network.target" "docker.service" "spindle-tap.service"]; 148 151 wantedBy = ["multi-user.target"]; 149 - path = [ 150 - pkgs.git 151 - ]; 152 152 serviceConfig = { 153 153 LogsDirectory = "spindle"; 154 154 StateDirectory = "spindle";
spindle/config/config.go

This patch was likely rebased, as context lines do not match.

spindle/git/git.go

This file has not been changed.

spindle/server.go

This patch was likely rebased, as context lines do not match.

spindle/tap.go

This patch was likely rebased, as context lines do not match.

History

5 rounds 0 comments
sign up or login to add to the discussion
1 commit
expand
nix,spindle: sync workflow files on sh.tangled.git.refUpdate
1/3 failed, 2/3 success
expand
merge conflicts detected
expand
  • appview/state/state.go:35
  • go.mod:9
  • go.sum:483
  • nix/gomod2nix.toml:510
expand 0 comments
1 commit
expand
nix,spindle: sync workflow files on sh.tangled.git.refUpdate
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
nix,spindle: sync workflow files on sh.tangled.git.refUpdate
1/3 failed, 2/3 success
expand
expand 0 comments
1 commit
expand
nix,spindle: sync workflow files on sh.tangled.git.refUpdate
1/3 failed, 2/3 success
expand
expand 0 comments
1 commit
expand
nix,spindle: sync workflow files on sh.tangled.git.refUpdate
1/3 failed, 2/3 success
expand
expand 0 comments