Merge pull request #17 from skx/16-github-actions

16 GitHub actions

Author: skx

.github/main.workflow

@@ -1,8 +1,21 @@
 #!/bin/sh
 
-# Install the lint-tool, and the shadow-tool
+# Install tools to test our code-quality.
 go get -u golang.org/x/lint/golint
 go get -u golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
+go get -u honnef.co/go/tools/cmd/staticcheck
+
+
+# Run the static-check tool - we ignore errors in goserver/static.go
+t=$(mktemp)
+staticcheck -checks all ./... | grep -v "have a package comment" > $t
+if [ -s $t ]; then
+    echo "Found errors via 'staticcheck'"
+    cat $t
+    rm $t
+    exit 1
+fi
+rm $t
 
 # At this point failures cause aborts
 set -e

.github/run-tests.sh

@@ -0,0 +1,10 @@
+on: pull_request
+name: Pull Request
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Test
+      uses: skx/github-action-tester@master

.github/workflows/pull_request.yml

@@ -0,0 +1,13 @@
+on:
+  push:
+    branches:
+    - master
+name: Push Event
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Test
+      uses: skx/github-action-tester@master

.github/workflows/push.yml

@@ -0,0 +1,14 @@
+on: release
+name: Handle Release
+jobs:
+  upload:
+    name: Upload
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Upload
+      uses: skx/github-action-publish-binaries@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        args: deployr-*

.github/workflows/release.yml

@@ -217,7 +217,6 @@ func (e *Evaluator) Run() error {
 				break
 			}
 			e.Changed = e.copyFiles(src, dst, true)
-			break
 
 		case "CopyFile":
 
@@ -243,7 +242,6 @@ func (e *Evaluator) Run() error {
 			}
 
 			e.Changed = e.copyFiles(src, dst, false)
-			break
 
 		case "DeployTo":
 
@@ -261,15 +259,13 @@ func (e *Evaluator) Run() error {
 				return err
 			}
 
-			break
-
 		case "IfChanged":
 
 			//
 			// If the previous copy didn't change then we can
 			// just skip this command.
 			//
-			if e.Changed == false {
+			if !e.Changed {
 				break
 			}
 
@@ -318,7 +314,6 @@ func (e *Evaluator) Run() error {
 			// Show the output
 			//
 			fmt.Printf("%s", result)
-			break
 
 		case "Run":
 
@@ -366,8 +361,6 @@ func (e *Evaluator) Run() error {
 			//
 			fmt.Printf("%s", result)
 
-			break
-
 		case "Set":
 
 			//
@@ -381,14 +374,11 @@ func (e *Evaluator) Run() error {
 			}
 			e.Variables[key] = val
 
-			break
-
 		case "Sudo":
 
 			//
 			// This is an error?
 			//
-			break
 		default:
 			return fmt.Errorf("unhandled statement - %v", statement.Token)
 		}
@@ -679,7 +669,7 @@ func (e *Evaluator) expandString(in string) string {
 	// Expand any variables which have previously been
 	// declared.
 	//
-	re := regexp.MustCompile("\\$\\{([^\\}]+)\\}")
+	re := regexp.MustCompile(`\$\{([^\}]+)\}`)
 	in = re.ReplaceAllStringFunc(in, func(in string) string {
 
 		in = strings.TrimPrefix(in, "${")

evaluator/evaluator.go

@@ -25,7 +25,7 @@ func New(input string) *Lexer {
 // Dump outputs the complete stream of tokens from the lexer,
 // consuming all input as it does so.
 func (l *Lexer) Dump() {
-	for true {
+	for {
 		tok := l.NextToken()
 		fmt.Printf("%v\n", tok)
 		if tok.Type == "EOF" {

lexer/lexer.go

@@ -135,7 +135,6 @@ func (p *Parser) Parse() ([]statement.Statement, error) {
 			s := statement.Statement{Token: tok}
 			s.Arguments = args
 			result = append(result, s)
-			break
 
 		case "CopyFile":
 
@@ -170,7 +169,6 @@ func (p *Parser) Parse() ([]statement.Statement, error) {
 			s := statement.Statement{Token: tok}
 			s.Arguments = args
 			result = append(result, s)
-			break
 
 		case "DeployTo":
 			//
@@ -200,7 +198,6 @@ func (p *Parser) Parse() ([]statement.Statement, error) {
 			s := statement.Statement{Token: tok}
 			s.Arguments = args
 			result = append(result, s)
-			break
 
 		case "IfChanged":
 
@@ -238,7 +235,6 @@ func (p *Parser) Parse() ([]statement.Statement, error) {
 			sudo = false
 
 			result = append(result, s)
-			break
 
 		case "Run":
 
@@ -276,7 +272,6 @@ func (p *Parser) Parse() ([]statement.Statement, error) {
 			sudo = false
 
 			result = append(result, s)
-			break
 
 		case "Set":
 
@@ -309,19 +304,16 @@ func (p *Parser) Parse() ([]statement.Statement, error) {
 			s := statement.Statement{Token: tok}
 			s.Arguments = args
 			result = append(result, s)
-			break
 
 		case "Sudo":
 			sudo = true
-			break
 
 		case "EOF":
 
 			//
 			// This causes our parsing-loop to terminate.
 			//
 			run = false
-			break
 		default:
 
 			//
@@ -344,7 +336,7 @@ func (p *Parser) GetArguments(expected []token.Token) ([]token.Token, error) {
 
 		next := p.Tokenizer.NextToken()
 		if next.Type != arg.Type {
-			return nil, fmt.Errorf("Expected %v as argument %d - Got %v", arg.Type, i+1, next.Type)
+			return nil, fmt.Errorf("expected %v as argument %d - Got %v", arg.Type, i+1, next.Type)
 		}
 
 		ret = append(ret, next)

parser/parser.go

@@ -127,7 +127,7 @@ func testSingleArgument(t *testing.T, tokenName token.Type, validType token.Type
 	if err == nil {
 		t.Fatalf("Expected to receive an error got none\n")
 	}
-	if !strings.Contains(err.Error(), "Expected "+string(validType)) {
+	if !strings.Contains(err.Error(), "expected "+string(validType)) {
 		t.Fatalf("We received an error, but not the correct one: %s\n", err.Error())
 	}