Skip to content

Commit

Permalink
Merge branch 'release-2.0.0'
Browse files Browse the repository at this point in the history
Conflicts:
  README.md
  • Loading branch information
agentmilindu committed May 15, 2019
2 parents 3d30910 + e87b91d commit c2e1d7b
Show file tree
Hide file tree
Showing 12 changed files with 156 additions and 89 deletions.
151 changes: 89 additions & 62 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 19 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
#Go parameters
.PHONY: all install test build clean

SHA=$(shell git rev-list HEAD --max-count=1 --abbrev-commit)
TAG?=$(shell git tag -l --contains HEAD)
VERSION=$(TAG)

ifeq ($(VERSION),)
VERSION := latest
endif


#Go parameters
GOCMD=go
GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test
DEP=dep
.PHONY : all install test

all : def
DEP=dep

def :
@$(GOINSTALL) -ldflags '-s'
all: build

install:
install:
@$(DEP) ensure

test:
test: install
@$(GOTEST) -v ./...

build: install
@$(GOINSTALL) -ldflags "-X main.version=$(VERSION)-$(SHA) -s"

clean:
rm -rf *
rm -rf *
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dunner

[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b2275e331d2745dc9527d45efbbf2da2)](https://app.codacy.com/app/LeopardsLab/Dunner?utm_source=github.com&utm_medium=referral&utm_content=leopardslab/Dunner&utm_campaign=Badge_Grade_Dashboard)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b2275e331d2745dc9527d45efbbf2da2)](https://app.codacy.com/app/Leopardslab/dunner?utm_source=github.com&utm_medium=referral&utm_content=leopardslab/dunner&utm_campaign=Badge_Grade_Dashboard)
[![Build Status](https://travis-ci.org/leopardslab/Dunner.svg?branch=master)](https://travis-ci.org/leopardslab/Dunner)

Dunner is a task runner tool like Grunt but uses Docker images like CircleCI do. You can define tasks and steps of the tasks in your `.dunner.yaml` file and then run these steps with `Dunner do taskname`
Expand Down Expand Up @@ -42,11 +42,11 @@ This work is still in progress. See the development plan.

## Development Plan

### [`v0.1`](https://github.com/leopardslab/Dunner/milestone/2)
### [`v0.1`](https://github.com/leopardslab/dunner/milestone/2)
- [x] Ability to define set of tasks and steps and run the task
- [x] Mount current dir as a volume
- [x] Ability to pass arguments to tasks
### [`v1.0`](https://github.com/leopardslab/Dunner/milestone/1)
### [`v1.0`](https://github.com/leopardslab/dunner/milestone/1)
- [x] Ability to add ENV variables
- [x] Ability to define the sub-dir that should be mounted to the task containers
- [x] Ability to mount other dirs to the task containers
Expand All @@ -64,6 +64,6 @@ This work is still in progress. See the development plan.

# Guides

* [User Guide](https://github.com/leopardslab/Dunner/wiki/User-Guide)
* [Installation Guide](https://github.com/leopardslab/Dunner/wiki/Installation-Guide)
* [Developer Guide](https://github.com/leopardslab/Dunner/wiki/Developer-Guide)
* [User Guide](https://github.com/leopardslab/dunner/wiki/User-Guide)
* [Installation Guide](https://github.com/leopardslab/dunner/wiki/Installation-Guide)
* [Developer Guide](https://github.com/leopardslab/dunner/wiki/Developer-Guide)
2 changes: 1 addition & 1 deletion cmd/do.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"github.com/leopardslab/Dunner/pkg/dunner"
"github.com/leopardslab/dunner/pkg/dunner"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/docker/docker/client"
"github.com/leopardslab/Dunner/internal/logger"
"github.com/leopardslab/dunner/internal/logger"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
Loading

0 comments on commit c2e1d7b

Please sign in to comment.