Open platform to collect and prioritize feedback
tooling: faster CI builds (#376)
Guilherme Oenningd82deba2b1f3
diff --git a/.circleci/config.yml b/.circleci/config.ymlindex 7315b399b..b01bba42a 100644--- a/.circleci/config.yml+++ b/.circleci/config.yml@@ -1,10 +1,15 @@version: 2+references:+ builder: &builder+ getfider/circleci:0.0.9+ workdir: &workdir+ /go/src/github.com/getfider/fider+jobs:- build:+ setup:docker:- - image: getfider/circleci:0.0.9- - image: postgres:9.6.8- working_directory: /go/src/github.com/getfider/fider+ - image: *builder+ working_directory: *workdirsteps:- checkout- restore_cache:@@ -14,36 +19,67 @@ jobs:name: npm installcommand: if [ ! -d "./node_modules" ]; then npm ci; fi- save_cache:+ name: save node_modules cachekey: fider-v1-npm-{{ checksum "package-lock.json" }}paths:- node_modules/++ build:+ docker:+ - image: *builder+ working_directory: *workdir+ steps:+ - checkout+ - restore_cache:+ keys:+ - fider-v1-npm-{{ checksum "package-lock.json" }}+ - run: make lint+ - run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build+ - 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-server:+ docker:+ - image: *builder+ - image: postgres:9.6.8+ working_directory: *workdir+ steps:+ - checkout- run:name: setup postgrescommand: |for i in 1 2 3 4 5; do psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE fider_ci" && break || sleep 2; donefor 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; donefor 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: make lint- run:name: testcommand: |mkdir ./dist- make test-uiDATABASE_URL=postgres://fider_ci:fider_ci_pw@localhost:5432/fider_ci?sslmode=disable make coveragebash <(curl -s https://codecov.io/bash)- - run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build- - 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-ui:+ docker:+ - image: *builder+ working_directory: *workdir+ steps:+ - checkout+ - restore_cache:+ keys:+ - fider-v1-npm-{{ checksum "package-lock.json" }}+ - run:+ name: test+ command: make test-ui+push:docker:- - image: getfider/circleci:0.0.9- working_directory: /go/src/github.com/getfider/fider+ - image: *builder+ working_directory: *workdirsteps:- attach_workspace:at: /tmp/workspace@@ -68,11 +104,24 @@ jobs:docker tag getfider/fider getfider/fider:PR_$CIRCLE_PR_NUMBERdocker push getfider/fider:PR_$CIRCLE_PR_NUMBERfi+workflows:version: 2all:jobs:- - build+ - setup+ - build:+ requires:+ - setup+ - test-ui:+ requires:+ - setup+ - test-server:+ requires:+ - setup- push:requires:- - build\ No newline at end of file+ - setup+ - build+ - test-ui+ - test-server\ No newline at end of filediff --git a/Makefile b/Makefileindex fa89024bf..d61daa23a 100644--- a/Makefile+++ b/Makefile@@ -20,12 +20,12 @@ test-ui:TZ='GMT' npx jest ./output/publictest-server:- godotenv -f .test.env go test ./... -p=1+ godotenv -f .test.env go test ./..test : test-server test-uicoverage:- godotenv -f .test.env go test ./... -p=1 -coverprofile=cover.out -coverpkg=all+ godotenv -f .test.env go test ./... -coverprofile=cover.out -coverpkg=alle2e-single:./scripts/e2e.sh singlediff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.goindex 87c7e035d..5228b8d59 100644--- a/app/pkg/dbx/dbx.go+++ b/app/pkg/dbx/dbx.go@@ -83,18 +83,19 @@ func (db Database) Seed() {// Migrate the database to latest versionfunc (db Database) Migrate() {-db.logger.Infof("Running migrations...")- m, err := migrate.New(- "file://"+env.Path("migrations"),- env.MustGet("DATABASE_URL"),- )-- if err == nil {- err = m.Up()- }+ err := retry(10, func() error {+ m, err := migrate.New(+ "file://"+env.Path("migrations"),+ env.MustGet("DATABASE_URL"),+ )+ if err != nil {+ return err+ }+ return m.Up()+ })- if err != nil && err != migrate.ErrNoChange {+ if err != nil {panic(fmt.Sprintf("Migrations failed with: %s:", err))} else {db.logger.Infof("Migrations finished with success.")@@ -303,3 +304,14 @@ func (trx Trx) Rollback() error {}return nil}++func retry(attempts int, callback func() error) error {+ var err error+ for i := 0; i < attempts; i++ {+ if err = callback(); err == nil || err == migrate.ErrNoChange {+ return nil+ }+ time.Sleep(500 * time.Millisecond)+ }+ return errors.Wrap(err, "retried for %d times", attempts)+}