Skip to content

Commit

Permalink
Merge feb9568 into a9aad89
Browse files Browse the repository at this point in the history
  • Loading branch information
architeacher committed Mar 20, 2019
2 parents a9aad89 + feb9568 commit 4307a1f
Show file tree
Hide file tree
Showing 61 changed files with 1,401 additions and 764 deletions.
35 changes: 22 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,36 @@
version: 2
version: 2.1

alias:
default: &default
working_directory: /go/src/github.com/ahmedkamals/foo-protocol-proxy
docker:
- image: circleci/golang:1.12
environment:
GOPATH: "/go"
GO111MODULE: "on"
REPO_NAME: "ahmedkamals"
IMAGE_NAME: "foo-protocol-proxy"
GITHUB_API: "https://api.github.com/"
DOCKER_USER: "ahmedkamals"
setup_remote_docker: &setup_remote_docker
version: 18.09.1-ce
docker_layer_caching: true

jobs:
validation:
docker:
- image: circleci/golang:1.9
working_directory: /go/src/github.com/ahmedkamals/foo-protocol-proxy
<<: *default
steps:
- checkout
- run: go get github.com/golang/lint/golint
- run: go get github.com/client9/misspell/cmd/misspell
- run: go get github.com/gordonklaus/ineffassign
- run: make validate
- run: make get-deps validate

unit:
docker:
- image: circleci/golang:1.9

working_directory: /go/src/github.com/ahmedkamals/foo-protocol-proxy
<<: *default
steps:
- checkout
- run: make unit

workflows:
version: 2
version: 2.1
build:
jobs:
- validation
Expand Down
14 changes: 10 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
.git
.git/
*.md
LICENSE
NOTICE
MAINTAINERS
.mailmap

# Binaries for programs and plugins
*.exe
Expand All @@ -18,8 +21,11 @@ LICENSE
.glide/

.idea/
.tests/
.bin/
.data/
.env
.docker*
*.iml
coverage/
bin/
data/
*.log
.github/
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ Thank you!
<!-- Specific steps, as minimally and precisely as possible. -->

## Anything else we need to know?
- OS (e.g. from /etc/os-release):
- Kernel (e.g. `uname -a`):
- Install tools:
- Others:

- OS (e.g. from /etc/os-release)
- Kernel (e.g. `uname -a`)
- Install tools
- Others
<!--
Additional information you deem important (e.g. issue happens only occasionally, special hardware required?, ...etc).
-->
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ To help things go as quickly as possible, please:
to the new release, include the string "action required".
2. If no release note is required, just write "NONE".
-->

```release-note
```

11 changes: 8 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@
.glide/

.idea/
.bin/
.tests/
.data/
.docker*
!.dockerignore
pkg/version/version.go
.env
*.iml
coverage/
bin/foo*
data/
*.log
.go
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sudo: required
go_import_path: github.com/ahmedkamals/foo-protocol-proxy

git:
depth: 38
depth: 18

matrix:
allow_failures:
Expand All @@ -16,6 +16,7 @@ env:
global:
- secure: "mW/CjSIq7lQOjhN+syhoJHNh0oyt9teDlhB9ZUSsylkVQPisHPj/G6D5KSnjWmQzvuVFlxN1++O0VAtDasEOCir4YTUwQVgfceC90bePxaTLcJeva3mJNDVBMZR/GVrsL9uunHscfLRNtX6TBLCh4NEO6H341J6vbF0GIQ3deOlCHBLNLnBsc1larUAzjOoIqeK0+X4rEo4HaMg1BWuH0XL+QNdI2WVPXueNOVhimCClsW3HSgPEea5KTozMd08Kr+LTbt+N2RaM6jb/F+CfCQEy8f7VoZKMZlD5m5VBI/AmJtjrR9mcFs0cKq4+im73x/x6v4WoCDndHdP3wq5vvVZzOK3CbhiYAUqp5nsiNzWu6IPyS9q81GleBFWI7zT6d9bZG5ah/+4J8Vw7AXwrYb8691sRQ5HzXVkV9vkDfV/YSsse0kIiwOywBGSN1zMzjxoXZdCAKBWPiLLhnxNJLJfPjwUCZzXEGXPfRVNT6PZPH4smDceaDYntHQBQAO9w3C4PCi0Qczolj8d+XFmRhstl6xoTcMiPsPZESA4SIilwFJlmOzLQvDrfh3LUWMMS06Im1u79amYLMNq7LMtcsuhm3LbvgHxuIsEEnwC+covHutPeDiExte843dKrnJL2cgZa2ttzpoIMk2qgT/XV2MZiUny+da9wLkoiJLWrXTo="
- BUILD=true
- GO111MODULE=on

branches:
only:
Expand All @@ -28,37 +29,37 @@ branches:
jobs:
include:
- stage: Validation
go: 1.9
go: 1.12
env:
- VALIDATE=true
- BUILD=false
install:
- make get-deps
- &unit-tests
stage: Unit tests
go: 1.8
go: 1.12
os: linux
env: TESTS=true
- <<: *unit-tests
os: osx
- <<: *unit-tests
go: 1.9.x
go: 1.12.x
- <<: *unit-tests
go: 1.9.x
go: 1.12.x
os: osx
- <<: *unit-tests
go: tip
- <<: *unit-tests
go: tip
os: osx
- stage: Integration tests
go: 1.9
go: 1.12
env:
- BUILD=false
script:
- make integration
- stage: Coverage
go: 1.9
go: 1.12
env:
- COVERAGE=true
- BUILD=false
Expand All @@ -69,7 +70,7 @@ before_install:
- bash ./.travis/install.sh

install:
- make setup
- make go-install

script:
# This to fix the error "fatal: ref HEAD is not a symbolic ref", that appears after every make call.
Expand Down
12 changes: 6 additions & 6 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,36 @@ Anyone who violates this code of conduct may be banned from the community.

Our open source community strives to:

* **Be forgiving and patient:** humans are fallible and as such prone to make mistakes and inexplicably change their
* __Be forgiving and patient:__ humans are fallible and as such prone to make mistakes and inexplicably change their
positions at times. Don't assume that other members are acting with malicious intent. Be prepared to forgive people
who make mistakes and assist each other in learning from them. Playing a blame game doesn't help anyone.

* **Be welcoming**: We strive to be a community that welcomes and supports people of all backgrounds and identities.
* __Be welcoming:__ We strive to be a community that welcomes and supports people of all backgrounds and identities.
This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour,
immigration status, social and economic class, educational level, sex, sexual orientation,
gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.

* **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others.
* __Be considerate:__ Your work will be used by other people, and you in turn will depend on the work of others.
Any decision you take will affect users and colleagues, and you should take those consequences into account when
making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's
primary language. So you should remember that the community has members with a diverse background, many of whom have
English as a second language. What might appear impolite, may simply be a result of a lack of knowledge
of the English language. Bear in mind that actions will have an impact on other community members and the project
as a whole, so take potential consequences into account before pursuing a course of action.

* **Be respectful**: Not all of us will agree all the time, so disagreements between people are to be expected
* __Be respectful:__ Not all of us will agree all the time, so disagreements between people are to be expected
and are usually the sign of healthy debate and engagement. Disagreements can lead to frustration and even anger
for some members, and We might all experience some frustration now and then, but it is no excuse for poor behavior
and poor manners, and we cannot allow that frustration to turn into a personal attack, insults, intimidation or
threatening behaviour as this does not improve the situation. Participants should thus take care to ensure
all communications / interactions stay professional at all times, because a community where people feel uncomfortable
or threatened is not a productive one.

* **Be careful in the words that we choose**: we are a community of professionals, and we conduct ourselves
* __Be careful in the words that we choose:__ we are a community of professionals, and we conduct ourselves
professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary
behavior aren't acceptable.

* **Try to understand why we disagree**: Disagreements, both social and technical, happen all the time.
* __Try to understand why we disagree:__ Disagreements, both social and technical, happen all the time.
It is important that we resolve disagreements and differing views constructively. Remember that we’re different.
The strength of our community comes from its diversity, people from a wide range of backgrounds.
Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint
Expand Down
40 changes: 0 additions & 40 deletions Dockerfile-proxy

This file was deleted.

6 changes: 0 additions & 6 deletions Makefile

This file was deleted.

1 change: 1 addition & 0 deletions Makefile
86 changes: 0 additions & 86 deletions Makefile.conf

This file was deleted.

Loading

0 comments on commit 4307a1f

Please sign in to comment.