Revert to old docs method

ammario · ammario · commit c88149147590 · 2022-07-23T19:04:44.000Z
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -6,13 +6,8 @@ on:
       - main
     tags:
       - "*"
-    paths-ignore:
-      - "docs/**"
 
   pull_request:
-    paths-ignore:
-      - "docs/**"
-      - ".github/**"
 
   workflow_dispatch:
 
@@ -35,9 +30,25 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  changes:
+    runs-on: ubuntu-latest
+    outputs:
+      docs-only: ${{ steps.filter.outputs.docs_count == steps.filter.outputs.all_count }}
+    steps:
+      # For pull requests it's not necessary to checkout the code
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            all:
+              - '**'
+            docs:
+              - 'docs/**'
+              - '.github/**'
   style-lint-golangci:
     name: style/lint/golangci
     timeout-minutes: 5
+    if: ${{ !needs.changes.outputs.docs_only }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -53,6 +64,7 @@ jobs:
     name: style/lint/shellcheck
     timeout-minutes: 5
     runs-on: ubuntu-latest
+    if: ${{ !needs.changes.outputs.docs_only }}
     steps:
       - uses: actions/checkout@v3
       - name: Run ShellCheck
@@ -65,6 +77,7 @@ jobs:
   style-lint-typescript:
     name: "style/lint/typescript"
     timeout-minutes: 5
+    if: ${{ !needs.changes.outputs.docs_only }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -92,6 +105,7 @@ jobs:
     name: "style/gen"
     timeout-minutes: 5
     runs-on: ubuntu-latest
+    if: ${{ !needs.changes.outputs.docs_only }}
     steps:
       - uses: actions/checkout@v3
 
@@ -127,6 +141,7 @@ jobs:
 
   style-fmt:
     name: "style/fmt"
+    if: ${{ !needs.changes.outputs.docs_only }}
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -159,6 +174,7 @@ jobs:
 
   test-go:
     name: "test/go"
+    if: ${{ !needs.changes.outputs.docs_only }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     strategy:
@@ -235,6 +251,7 @@ jobs:
 
   test-go-postgres:
     name: "test/go/postgres"
+    if: ${{ !needs.changes.outputs.docs_only }}
     runs-on: ubuntu-latest
     # This timeout must be greater than the timeout set by `go test` in
     # `make test-postgres` to ensure we receive a trace of running
@@ -306,7 +323,9 @@ jobs:
     name: "deploy"
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    if: github.ref == 'refs/heads/main' && !github.event.pull_request.head.repo.fork
+    if: |
+      github.ref == 'refs/heads/main' && !github.event.pull_request.head.repo.fork
+      && !needs.changes.outputs.docs_only
     permissions:
       contents: read
       id-token: write
@@ -412,6 +431,7 @@ jobs:
 
   test-js:
     name: "test/js"
+    if: ${{ !needs.changes.outputs.docs_only }}
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
diff --git a/cli/ssh_test.go b/cli/ssh_test.go
@@ -91,9 +91,6 @@ func TestSSH(t *testing.T) {
 
 		// Shells on Mac, Windows, and Linux all exit shells with the "exit" command.
 		pty.WriteLine("exit")
-		// Read output to prevent hang on macOS, see:
-		// https://github.com/coder/coder/issues/2122
-		pty.ExpectMatch("exit")
 		<-cmdDone
 	})
 	t.Run("Stdio", func(t *testing.T) {
@@ -227,9 +224,6 @@ func TestSSH(t *testing.T) {
 
 		// And we're done.
 		pty.WriteLine("exit")
-		// Read output to prevent hang on macOS, see:
-		// https://github.com/coder/coder/issues/2122
-		pty.ExpectMatch("exit")
 		<-cmdDone
 	})
 }
diff --git a/docs/secrets.md b/docs/secrets.md
@@ -1,7 +1,5 @@
 # Secrets
 
-Blah blah...
-
 <blockquote class="info">
 This article explains how to use secrets in a workspace. To authenticate the
 workspace provisioner, see <a href="./templates/authentication">this</a>.
diff --git a/go.mod b/go.mod
@@ -243,7 +243,7 @@ require (
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/spf13/afero v1.9.2
+	github.com/spf13/afero v1.9.0
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
diff --git a/go.sum b/go.sum
@@ -1699,8 +1699,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
-github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.9.0 h1:sFSLUHgxdnN32Qy38hK3QkYBFXZj9DKjVjCUCtD7juY=
+github.com/spf13/afero v1.9.0/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
diff --git a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
@@ -33,7 +33,7 @@ dayjs.extend(timezone)
 
 export const Language = {
   errorNoDayOfWeek: "Must set at least one day of week if start time is set",
-  errorNoTime: "Start time is required when days of the week are selected",
+  errorNoTime: "Start time is required",
   errorTime: "Time must be in HH:mm format (24 hours)",
   errorTimezone: "Invalid timezone",
   daysOfWeekLabel: "Days of Week",
