Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

tooling: use github actions (#785)

Guilherme Oenning6ee8040d4c9f
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 138953d91..000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-version: 2
-references:
- builder: &builder
- getfider/circleci:0.0.21
- workdir: &workdir
- /workdir
-
-jobs:
- setup:
- docker:
- - image: *builder
- working_directory: *workdir
- steps:
- - checkout
- - restore_cache:
- keys:
- - fider-v4-npm-{{ checksum "package-lock.json" }}
- - run:
- name: npm install
- command: if [ ! -d "./node_modules" ]; then npm ci; fi
- - save_cache:
- name: save node_modules cache
- key: fider-v4-npm-{{ checksum "package-lock.json" }}
- paths:
- - node_modules/
-
- build:
- docker:
- - image: *builder
- working_directory: *workdir
- steps:
- - checkout
- - restore_cache:
- keys:
- - fider-v4-npm-{{ checksum "package-lock.json" }}
- - run: mage lint
- - setup_remote_docker
- - run: mage build:docker
- - 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
- - image: minio/minio:RELEASE.2018-12-06T01-27-43Z
- command: server /data
- environment:
- MINIO_ACCESS_KEY: s3user
- MINIO_SECRET_KEY: s3user-s3cr3t
- working_directory: *workdir
- steps:
- - checkout
- - run:
- name: waiting for postgres to be ready
- command: |
- for i in `seq 1 60`;
- do
- nc -z localhost 5432 && echo Success && exit 0
- echo -n .
- sleep 1
- done
- echo Failed waiting for Postgres && exit 1
- - run:
- name: initialize postgres database
- command: |
- for i in 1 2 3 4 5 6 7 8 9 10; 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 6 7 8 9 10; 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 6 7 8 9 10; do psql -h localhost -p 5432 -U postgres -c "CREATE USER fider_ci WITH PASSWORD 'fider_ci_pw'" && break || sleep 2; done
- - run:
- name: test
- command: |
- mkdir ./dist
- DATABASE_URL=postgres://fider_ci:fider_ci_pw@localhost:5432/fider_ci?sslmode=disable mage test:coverage
- bash <(curl -s https://codecov.io/bash)
-
- test-ui:
- docker:
- - image: *builder
- working_directory: *workdir
- steps:
- - checkout
- - restore_cache:
- keys:
- - fider-v4-npm-{{ checksum "package-lock.json" }}
- - run:
- name: test
- command: mage test:ui
-
- push:
- docker:
- - image: *builder
- working_directory: *workdir
- 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:
- - setup
- - build:
- requires:
- - setup
- - test-ui:
- requires:
- - setup
- - test-server:
- requires:
- - setup
- - push:
- requires:
- - setup
- - build
- - test-ui
- - test-server
diff --git a/.github/workflows/fider.yml b/.github/workflows/fider.yml
new file mode 100644
index 000000000..42fe982c5
--- /dev/null
+++ b/.github/workflows/fider.yml
@@ -0,0 +1,91 @@
+name: fider
+
+on: [push]
+
+jobs:
+ test-ui:
+ name: test-ui
+ runs-on: ubuntu-latest
+ container:
+ image: getfider/githubci:0.0.1
+
+ steps:
+ - name: checkout code
+ uses: actions/checkout@v1
+ - run: npm ci
+ - run: mage lint
+ - run: mage test:ui
+
+ test-server:
+ name: test-server
+ runs-on: ubuntu-latest
+ container:
+ image: getfider/githubci:0.0.1
+
+ services:
+ minio:
+ image: getfider/minio:0.0.2
+ ports:
+ - 9000:9000
+ env:
+ MINIO_ACCESS_KEY: s3user
+ MINIO_SECRET_KEY: s3user-s3cr3t
+ postgres:
+ image: postgres:9.6.8
+ env:
+ POSTGRES_USER: fider_ci
+ POSTGRES_PASSWORD: fider_ci_pw
+ POSTGRES_DB: fider_ci
+ ports:
+ - 5432:5432
+ options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+ steps:
+ - name: checkout code
+ uses: actions/checkout@v1
+ - name: mage test:server
+ run: |
+ mkdir ./dist
+ mage test:server
+ env:
+ BLOB_STORAGE_S3_ENDPOINT_URL: http://minio:9000
+ DATABASE_URL: postgres://fider_ci:fider_ci_pw@postgres:5432/fider_ci?sslmode=disable
+
+ build:
+ name: build
+ runs-on: ubuntu-latest
+ needs: [test-server, test-ui]
+ container:
+ image: getfider/githubci:0.0.1
+
+ steps:
+ - name: checkout code
+ uses: actions/checkout@v1
+ - run: npm ci
+ - run: mage build:docker
+
+ - name: extract branch name
+ run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+ id: getBranch
+
+ - name: extract PR number
+ uses: jwalton/gh-find-current-pr@v1
+ id: getPR
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+
+ - uses: azure/docker-login@v1
+ with:
+ username: ${{ secrets.DOCKER_USER }}
+ password: ${{ secrets.DOCKER_PASS }}
+
+ - name: push master docker image
+ if: steps.getBranch.outputs.branch == 'master'
+ run: |
+ docker tag getfider/fider getfider/fider:master
+ docker push getfider/fider:master
+
+ - name: push PR docker image
+ run: |
+ docker tag getfider/fider getfider/fider:PR_${{ steps.getPR.outputs.number }}
+ docker push getfider/fider:PR_${{ steps.getPR.outputs.number }}
\ No newline at end of file
diff --git a/app/services/blob/blob_test.go b/app/services/blob/blob_test.go
index 0a0505318..44f5f5bb7 100644
--- a/app/services/blob/blob_test.go
+++ b/app/services/blob/blob_test.go
@@ -116,9 +116,9 @@ func AllOperations(ctx context.Context) {
err = bus.Dispatch(ctx, q)
Expect(err).IsNil()
Expect(q.Key).Equals(testCase.key)
- Expect(q.Result.Content).Equals(bytes)
Expect(q.Result.Size).Equals(int64(len(bytes)))
Expect(q.Result.ContentType).Equals(testCase.contentType)
+ Expect(q.Result.Content).Equals(bytes)
err = bus.Dispatch(ctx, &cmd.DeleteBlob{
Key: testCase.key,
diff --git a/go.mod b/go.mod
index 53a1fcf38..d47588f78 100644
--- a/go.mod
+++ b/go.mod
@@ -27,4 +27,4 @@ require (
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890
golang.org/x/text v0.3.2
google.golang.org/appengine v1.0.0
-)
+)
\ No newline at end of file
diff --git a/go.sum b/go.sum
index 145217a8b..3e965f021 100644
--- a/go.sum
+++ b/go.sum
@@ -58,4 +58,4 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
\ No newline at end of file