Merge branch 'master' into validate_instance_cmd

Author: uwedeportivo

CHANGELOG.md

@@ -0,0 +1,26 @@
+<!--
+###################################### READ ME ###########################################
+### This changelog should always be read on `master` branch. Its contents on version   ###
+### branches do not necessarily reflect the changes that have gone into that branch.   ###
+##########################################################################################
+-->
+
+# Changelog
+
+All notable changes to `src-cli` are documented in this file.
+
+## Unreleased
+
+### Added
+
+- Pull missing docker images automatically. [#191](https://github.com/sourcegraph/src-cli/pull/191)
+
+- Searches that result in errors will now display any alerts returned by Sourcegraph, including suggestions for how the search could be corrected. [#221](https://github.com/sourcegraph/src-cli/pull/221)
+
+### Changed
+
+- The terminal UI has been replaced by the logger-based UI that was previously only visible in verbose-mode (`-v`). [#228](https://github.com/sourcegraph/src-cli/pull/228)
+
+### Fixed
+
+### Removed

README.md

@@ -73,16 +73,6 @@ Point `src` to your instance and access token using environment variables:
 SRC_ENDPOINT=https://sourcegraph.example.com SRC_ACCESS_TOKEN="secret" src search 'foobar'
 ```
 
-### Via global configuration file
-
-Create a `$HOME/src-config.json` with:
-
-```sh
-{"endpoint": "https://sourcegraph.example.com", "accessToken": "secret"}
-```
-
-Then `src search 'foobar'` and other commands will automatically use that configuration!
-
 ### Where to get an access token
 
 Visit your Sourcegraph instance (or https://sourcegraph.com), click your username in the top right to open the user menu, select **Settings**, and then select **Access tokens** in the left hand menu.

cmd/src/actions_create.go

@@ -7,27 +7,28 @@ import (
 	"os"
 )
 
-const actionDefinitionTemplate = `{
-  "$schema": "https://raw.githubusercontent.com/sourcegraph/src-cli/master/schema/actions.schema.json",
-  "scopeQuery": "",
-  "steps": [
-  ]
-}
+const actionDefinitionTemplate = `scopeQuery: ""
+
+steps:
+  - type: command
+    args:
+    - echo
+    - Hello world
 `
 
 func init() {
 	usage := `
-Create an empty action definition in action.json (if not -o flag is given). This command is meant to help with creating action definitions to be used with 'src actions exec'.
+Create an empty action definition in action.yml (if no -o flag is given). This command is meant to help with creating action definitions to be used with 'src actions exec'.
 
 Examples:
 
-  Create a new action definition in action.json:
+  Create a new action definition in action.yml:
 
 		$ src actions create
 
-  Create a new action definition in ~/Documents/my-action.json:
+  Create a new action definition in ~/Documents/my-action.yml:
 
-		$ src actions create -o ~/Documents/my-action.json
+		$ src actions create -o ~/Documents/my-action.yml
 `
 
 	flagSet := flag.NewFlagSet("create", flag.ExitOnError)
@@ -38,7 +39,7 @@ Examples:
 	}
 
 	var (
-		fileFlag = flagSet.String("o", "action.json", "The destination file name. Default value is 'action.json'")
+		fileFlag = flagSet.String("o", "action.yml", "The destination file name. Default value is 'action.yml'")
 	)
 
 	handler := func(args []string) error {