Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

tools: migrate from TravisCI to CircleCI (#296)

Guilherme Oenning3eda06b94430
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..a718c9264
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,81 @@
+version: 2
+jobs:
+ build:
+ docker:
+ - image: getfider/circleci:0.0.6
+ working_directory: /go/src/github.com/getfider/fider
+ steps:
+ - checkout
+ - restore_cache:
+ keys:
+ - fider-v1-npm-{{ checksum "package-lock.json" }}
+ - run:
+ name: npm install
+ command: if [ ! -d "./node_modules" ]; then npm install; fi
+ - run: make lint
+ - run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build
+ - save_cache:
+ key: fider-v1-npm-{{ checksum "package-lock.json" }}
+ paths:
+ - node_modules/
+ - setup_remote_docker
+ - run: docker build -t getfider/fider .
+ - run: docker save -o ./docker-image.tar getfider/fider
+ - persist_to_workspace:
+ root: ./
+ paths:
+ - docker-image.tar
+ test:
+ docker:
+ - image: getfider/circleci:0.0.6
+ - image: postgres:9.6.2
+ working_directory: /go/src/github.com/getfider/fider
+ steps:
+ - checkout
+ - run:
+ name: setup postgres
+ command: |
+ mkdir dist
+ for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE fider_ci" && break || sleep 2; done
+ for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE EXTENSION pg_trgm" -d fider_ci && break || sleep 2; done
+ for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE USER fider_ci WITH PASSWORD 'fider_ci_pw'" && break || sleep 2; done
+ - run: DATABASE_URL=postgres://fider_ci:fider_ci_pw@localhost:5432/fider_ci?sslmode=disable make coverage
+ - run: bash <(curl -s https://codecov.io/bash)
+ push:
+ docker:
+ - image: getfider/circleci:0.0.6
+ working_directory: /go/src/github.com/getfider/fider
+ steps:
+ - attach_workspace:
+ at: /tmp/workspace
+ - setup_remote_docker
+ - run: docker load -i /tmp/workspace/docker-image.tar
+ - run:
+ name: Set PR number
+ command: |
+ echo 'export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"' >> $BASH_ENV
+ source $BASH_ENV
+ echo $CIRCLE_PR_NUMBER
+ - run:
+ name: push image to docker registry
+ command: |
+ if [ $DOCKER_USER != "" ] && [ $CIRCLE_BRANCH == "master" ] && [[ -z $CI_PULL_REQUEST ]]; then
+ docker login -u $DOCKER_USER -p $DOCKER_PASS
+ docker tag getfider/fider getfider/fider:master
+ docker push getfider/fider:master
+ fi
+ if [ $DOCKER_USER != "" ] && [[ ! -z $CI_PULL_REQUEST ]]; then
+ docker login -u $DOCKER_USER -p $DOCKER_PASS
+ docker tag getfider/fider getfider/fider:PR_$CIRCLE_PR_NUMBER
+ docker push getfider/fider:PR_$CIRCLE_PR_NUMBER
+ fi
+workflows:
+ version: 2
+ all:
+ jobs:
+ - build
+ - test
+ - push:
+ requires:
+ - build
+ - test
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c66e9d170..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-language: go
-
-sudo: false
-dist: trusty
-
-go: "1.10"
-
-addons:
- postgresql: "9.6"
-
-install:
- - go get github.com/joho/godotenv/cmd/godotenv &
- - go get github.com/dave/courtney &
- - nvm use 8.9
- - psql -U postgres -c 'CREATE DATABASE fider_ci;'
- - psql -U postgres -c "CREATE EXTENSION pg_trgm;" fider_ci
- - psql -U postgres -c "CREATE USER fider_ci WITH PASSWORD 'fider_ci_pw';"
-
-script:
- - npm install
- - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build
- - make lint
- - DATABASE_URL=postgres://fider_ci:fider_ci_pw@localhost:5432/fider_ci?sslmode=disable make coverage
- - |
- if [ $DOCKER_USERNAME != "" ] && [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
- docker build -t getfider/fider .
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
- docker tag getfider/fider getfider/fider:master
- docker push getfider/fider:master
- fi
- - |
- if [ $DOCKER_USERNAME != "" ] && [ $TRAVIS_PULL_REQUEST != "false" ]; then
- docker build -t getfider/fider .
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
- docker tag getfider/fider getfider/fider:PR_$TRAVIS_PULL_REQUEST
- docker push getfider/fider:PR_$TRAVIS_PULL_REQUEST
- fi
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f8677dafc..a64870d14 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@ lint:
# Testing
test:
- godotenv -f .test.env go test ./... -cover -p=1
+ godotenv -f .test.env go test ./... -p=1
coverage:
- godotenv -f .test.env courtney -o cover.out $$(go list ./...)
+ godotenv -f .test.env go test ./... -p=1 -coverprofile=cover.out -coverpkg=all
e2e-single:
./scripts/e2e.sh single
diff --git a/README.md b/README.md
index c610d35a3..388e4c51f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
![](/public/assets/images/logo-small.png)
-# Fider &middot; [![status](https://travis-ci.org/getfider/fider.svg?branch=dev)](https://travis-ci.org/getfider/fider) [![codecov](https://codecov.io/gh/getfider/fider/branch/master/graph/badge.svg)](https://codecov.io/gh/getfider/fider)
+# Fider &middot; [![CircleCI](https://circleci.com/gh/getfider/fider/tree/master.svg?style=svg)](https://circleci.com/gh/getfider/fider/tree/master) [![codecov](https://codecov.io/gh/getfider/fider/branch/master/graph/badge.svg)](https://codecov.io/gh/getfider/fider)
Fider is an open platform to collect and organize customer feedback. By using the platform, your community can share, vote and discuss on ideas they have to make your product or company even better.
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 1a6bc9077..c8b98526a 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -2,6 +2,7 @@ package dbx
import (
"database/sql"
+ "fmt"
"io/ioutil"
"reflect"
"time"
@@ -90,9 +91,7 @@ func (db Database) Migrate() {
}
if err != nil && err != migrate.ErrNoChange {
- db.logger.Errorf("Error: %s.", err)
-
- panic("Migrations failed.")
+ panic(fmt.Sprintf("Migrations failed with: %s:", err))
} else {
db.logger.Infof("Migrations finished with success.")
}
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index 2d8f30a34..ef4620fda 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -59,6 +59,12 @@ func (r *Renderer) getBundle(folder string) string {
if len(files) > 0 {
return files[0].Name()
}
+
+ //During Test run, don't panic if bundle is not available
+ if env.IsTest() {
+ return ""
+ }
+
panic(fmt.Sprintf("Bundle not found: %s.", folder))
}
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 000000000..cceac5963
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,20 @@
+codecov:
+ notify:
+ require_ci_to_pass: yes
+
+coverage:
+ precision: 2
+ round: nearest
+ range: "70...100"
+
+ status:
+ project: no
+ patch: no
+ changes: no
+
+ ignore:
+ - "vendor"
+
+comment:
+ layout: "reach, diff, flags, files, footer"
+ behavior: default
\ No newline at end of file