Invalidate cache on matrix OS

kylecarbs · kylecarbs · commit 69aec02c66a4 · 2022-02-19T01:45:10.000Z
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -138,9 +138,9 @@ jobs:
             ~/.cache/go-build
             ~/Library/Caches/go-build
             %LocalAppData%\go-build
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: ${{ matrix.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ matrix.os }}-go-
 
       - run: go install gotest.tools/gotestsum@latest
 
diff --git a/peer/conn.go b/peer/conn.go
@@ -183,12 +183,15 @@ func (c *Conn) init() error {
 		}
 	})
 	c.rtc.OnConnectionStateChange(func(peerConnectionState webrtc.PeerConnectionState) {
-		if c.isClosed() {
-			// Make sure we don't log after Close() has been called.
-			return
-		}
-		c.opts.Logger.Debug(context.Background(), "rtc connection updated",
-			slog.F("state", peerConnectionState))
+		go func() {
+			c.closeMutex.Lock()
+			defer c.closeMutex.Unlock()
+			if c.isClosed() {
+				return
+			}
+			c.opts.Logger.Debug(context.Background(), "rtc connection updated",
+				slog.F("state", peerConnectionState))
+		}()
 
 		switch peerConnectionState {
 		case webrtc.PeerConnectionStateDisconnected:
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -110,10 +110,13 @@ func (p *provisionerDaemon) connect(ctx context.Context) {
 			if errors.Is(err, context.Canceled) {
 				return
 			}
+			p.closeMutex.Lock()
 			if p.isClosed() {
+				p.closeMutex.Unlock()
 				return
 			}
 			p.opts.Logger.Warn(context.Background(), "failed to dial", slog.Error(err))
+			p.closeMutex.Unlock()
 			continue
 		}
 		p.opts.Logger.Debug(context.Background(), "connected")

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,13 @@ func (p *provisionerDaemon) connect(ctx context.Context) {`
`110`	`110`	`if errors.Is(err, context.Canceled) {`
`111`	`111`	`return`
`112`	`112`	`}`
	`113`	`+ p.closeMutex.Lock()`
`113`	`114`	`if p.isClosed() {`
	`115`	`+ p.closeMutex.Unlock()`
`114`	`116`	`return`
`115`	`117`	`}`
`116`	`118`	`p.opts.Logger.Warn(context.Background(), "failed to dial", slog.Error(err))`
	`119`	`+ p.closeMutex.Unlock()`
`117`	`120`	`continue`
`118`	`121`	`}`
`119`	`122`	`p.opts.Logger.Debug(context.Background(), "connected")`