Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Mutagen 2 #500

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,23 @@ commands:
description: |
Installs our go dependancies and deals with caching and loading the cache
steps:
- restore_cache:
keys:
- pkg-cache-{{ checksum "Gopkg.lock" }}
# - restore_cache:
# keys:
# - pkg-cache-{{ checksum "Gopkg.lock" }}
- run: go get -u github.com/jstemmer/go-junit-report
- run:
name: Install dep
command: |
if [ ! -d /go/src/github.com/garden-io/garden/vendor ]; then
# if [ ! -d /go/src/github.com/garden-io/garden/vendor ]; then
# This needs to match the version installed locally
curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o /go/bin/dep
chmod +x /go/bin/dep
/go/bin/dep ensure
fi
- save_cache:
key: pkg-cache-{{ checksum "Gopkg.lock" }}
paths:
- "/go/src/github.com/garden-io/garden/vendor"
# fi
# - save_cache:
# key: pkg-cache-{{ checksum "Gopkg.lock" }}
# paths:
# - "/go/src/github.com/garden-io/garden/vendor"

docker_build:
description: Builds and Tags a Docker Image
Expand Down Expand Up @@ -171,11 +171,12 @@ jobs:
name: Unit Tests
command: |
cd garden-cli
go test -v 2>&1 | go-junit-report > /tmp/report.xml
- store_artifacts:
path: /tmp/report.xml
- store_test_results:
path: /tmp/
go build
# go test -v 2>&1 | go-junit-report > /tmp/report.xml
# - store_artifacts:
# path: /tmp/report.xml
# - store_test_results:
# path: /tmp/
build-cli:
<<: *go-config
steps:
Expand Down Expand Up @@ -311,13 +312,13 @@ workflows:
- test-cli:
requires:
- build-service
- test-service
- build-dashboard
- build-sync-docker
- build-service-docker:
requires:
- build-service
- build-dashboard
# - test-service
# - build-dashboard
# - build-sync-docker
# - build-service-docker:
# requires:
# - build-service
# - build-dashboard
master:
jobs:
# Duplicated here so we can reference steps that depends on it
Expand Down
216 changes: 191 additions & 25 deletions Gopkg.lock

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

4 changes: 4 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
name = "gopkg.in/yaml.v2"
version = "2.2.1"

[[constraint]]
name = "github.com/havoc-io/mutagen"
version = "v0.7.0"

# [[constraint]]
# branch = "master"
# name = "k8s.io/api"
Expand Down
5 changes: 5 additions & 0 deletions garden-cli/config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"fmt"
"io/ioutil"
"log"
"os"
Expand Down Expand Up @@ -73,6 +74,10 @@ func getProjectID(projectDir string) string {
return projectID
}

func makeResourceName(prefix string, name string, id string) string {
return fmt.Sprintf("%s--%s-%s", prefix, name, id)
}

func getGardenHomeDir() string {
// TODO: allow override via env var
homeDir := util.GetHomeDir()
Expand Down
4 changes: 4 additions & 0 deletions garden-cli/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ const ServiceImage = "gardenengine/garden-service:latest"

// ProjectPath is where to find the code inside ServiceImage
const ProjectPath = "/project"

// Mutagen is the synchronization tool Garden uses for syncing files from
// the host into the sync container. Expects the following version.
const MutagenVersion = "0.7.0"
Loading