chore(deps): update dependencies (#1351)

Co-authored-by: Renovate Bot <[email protected]>

act/container/docker_proxy_test.go

@@ -371,6 +371,9 @@ func TestDockerProxyWithDaemon(t *testing.T) {
 
 	job := "proxy-test-" + strconv.FormatInt(time.Now().UnixNano(), 36)
 	proxy, err := StartDockerProxy(daemonSocketPath(t, direct), dir, job)
+	if os.Geteuid() != 0 && errors.Is(err, os.ErrPermission) {
+		t.Skipf("non-root runners that cannot take the daemon socket's ownership get it directly: %v", err)
+	}
 	require.NoError(t, err)
 	t.Cleanup(func() { _ = proxy.Close(context.Background()) })
 	viaProxy, err := mobyclient.New(mobyclient.WithHost("unix://" + proxy.Socket))

act/container/docker_run.go

@@ -879,7 +879,10 @@ func (cr *containerReference) waitForCommand(ctx context.Context, resp client.Hi
 		// truncate the tail of the log. The goroutine exits once the hijacked
 		// stream is closed by resp.Close() in the caller's defer.
 		select {
-		case <-cmdResponse:
+		case err := <-cmdResponse:
+			if err != nil {
+				logger.Debugf("Failed to drain command output after cancellation: %v", err)
+			}
 		case <-time.After(drainGracePeriod):
 			logger.Warn("Timed out draining command output after cancellation")
 		}

act/runner/action_test.go

@@ -465,7 +465,7 @@ func TestExecAsDockerHoldsCloneLockForRemoteUncached(t *testing.T) {
 
 	cancel()
 	releaseOnce()
-	<-done
+	assert.ErrorIs(t, <-done, context.Canceled)
 }
 
 func TestDockerActionImageTag(t *testing.T) {

act/runner/testdata/defaults-run/main.yaml

@@ -8,7 +8,7 @@ jobs:
   without-defaults:
     runs-on: ubuntu-latest
     steps:
-    - run: echo $SHELL | grep -v bash || exit 1
+    - run: '[ -z ${BASH+x} ] || shopt -oq posix || exit 1'
   with-defaults:
     runs-on: ubuntu-latest
     defaults:
@@ -17,7 +17,7 @@ jobs:
         working-directory: /tmp
     steps:
     - run: |
-        echo $SHELL | grep bash || exit 1
+        [ -n ${BASH+x} ] && ! shopt -oq posix || exit 1
         [ $(pwd) = /tmp ] || exit 2
   override-in-step:
     runs-on: ubuntu-latest
@@ -25,5 +25,5 @@ jobs:
       run:
         shell: bash
     steps:
-    - run: echo $SHELL | grep -v bash || exit 1
+    - run: '[ -z ${BASH+x} ] || shopt -oq posix || exit 1'
       shell: sh

act/runner/testdata/shells/sh/push.yml

@@ -10,13 +10,13 @@ jobs:
     steps:
       - shell: ${{ env.MY_SHELL }}
         run: |
-          if [ -z ${BASH+x} ]; then
+          if [ -z ${BASH+x} ] || shopt -oq posix; then
             echo "I'm sh!"
           else
             exit 1
           fi
       - run: |
-          if [ -z ${BASH+x} ]; then
+          if [ -z ${BASH+x} ] || shopt -oq posix; then
             echo "I'm sh!"
           else
             exit 1
@@ -27,7 +27,7 @@ jobs:
     steps:
       - shell: ${{ env.MY_SHELL }}
         run: |
-          if [ -z ${BASH+x} ]; then
+          if [ -z ${BASH+x} ] || shopt -oq posix; then
             echo "I'm sh!"
           else
             exit 1