Skip to content

Commit

Permalink
Merge 60da085 into a5b1481
Browse files Browse the repository at this point in the history
  • Loading branch information
jbeemster committed Jul 17, 2020
2 parents a5b1481 + 60da085 commit 7ae0cad
Show file tree
Hide file tree
Showing 437 changed files with 1,013 additions and 72,596 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/snyk.yml
@@ -0,0 +1,21 @@

name: Snyk

on:
push:
branches: [ master ]

jobs:
security:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/golang@master
with:
command: monitor
args: --project-name=sql-runner
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
41 changes: 11 additions & 30 deletions .gitignore
@@ -1,33 +1,14 @@
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
*.a
*.so
# Golang
vendor/

# Folders
_obj
_test
# IntelliJ
.idea

# Architecture specific extensions/prefixes
*.[568vq]
[568vq].out
# macOS
.DS_Store

*.cgo1.go
*.cgo2.c
_cgo_defun.c
_cgo_gotypes.go
_cgo_export.*

_testmain.go

*.exe
*.test
*.prof

# This project's binaries
sql-runner
*.tmp
coverage.out
coverage.html

# Vagrant
.vagrant/
# Project
build/
dist/
.release.yml.tmp
config.yml
17 changes: 3 additions & 14 deletions .release.yml
@@ -1,9 +1,4 @@
---
output_paths:
linux : dist/linux/sql-runner
darwin : dist/darwin/sql-runner
windows : dist/windows/sql-runner

local:
root_dir : <%= ENV['TRAVIS_BUILD_DIR'] %>

Expand All @@ -21,25 +16,19 @@ packages:
continue_on_conflict: false
version : <%= CMD['cat VERSION'] %>
build_version : <%= ENV['TRAVIS_TAG'] %>

build_commands:
- gox -osarch=linux/amd64 -output={{ output_paths.linux }} ./sql_runner/
- gox -osarch=darwin/amd64 -output={{ output_paths.darwin }} ./sql_runner/
- gox -osarch=windows/amd64 -output={{ output_paths.windows }} ./sql_runner/

artifacts:
- prefix : "sql_runner_"
suffix : "_linux_amd64"
type : "zip"
binary_paths:
- "{{ output_paths.linux }}"
- build/output/linux/sql-runner
- prefix : "sql_runner_"
suffix : "_darwin_amd64"
type : "zip"
binary_paths:
- "{{ output_paths.darwin }}"
- build/output/darwin/sql-runner
- prefix : "sql_runner_"
suffix : "_windows_amd64"
type : "zip"
binary_paths:
- "{{ output_paths.windows }}.exe"
- build/output/windows/sql-runner.exe
37 changes: 14 additions & 23 deletions .travis.yml
@@ -1,40 +1,31 @@
dist: trusty
sudo: false

sudo: required
language: go
services:
- docker
go:
- 1.9.2
- tip

before_install:
- go get github.com/mattn/goveralls
- go get golang.org/x/tools/cmd/cover
- "1.13.8"

before_script:
- ./integration/setup_travis.sh
- make setup-up

script:
- go build -o sql-runner ./sql_runner/
- ./integration/run_tests.sh
- go test ./sql_runner/ -v -covermode=count -coverprofile=coverage.out
- $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci
- make
- make goveralls
- DISTRO=linux make integration

before_deploy:
- go get github.com/mitchellh/gox
- pip install --user release-manager==0.1.0
- sudo pip install pyOpenSSL==16.2.0
- pip install --user release-manager==0.4.1

deploy:
skip_cleanup: true
provider: script
script: release-manager --config .release.yml --check-version --make-version --make-artifact --upload-artifact
script: make release
on:
condition: '"${TRAVIS_GO_VERSION}" == "1.9.2"'
condition: '"${TRAVIS_GO_VERSION}" == "1.13.8"'
tags: true

addons:
postgresql: '9.3'

env:
global:
- secure: eP2CEhjE6YEgajudRcW6Lsyy92IxAB1KS5Cw0p/defwpouSuZS4NF8+YjcUhfI9sbkobL6KGaL12CYqLWToepQpiDHJ1eRaH+/8HQ+kgqwLxmHptVlqEXhkQPVJL04MvxZqeXocuOluGlWHOHMdlmDTA7eI/tKJtyykIRKyXFAc=
- secure: TP/mMjN910q8M/tknHkPxdYfKl25eQqdSscfTlQlnBxJpQgrgX25WgK1XuNI+IUTTmn1cM/eVRyKvUWflxqzwSUhgWO7s1EcN18WYU7Xl+RkWaoOMjqzV3q5l4M8rDK8LiBM/xrcz/rQMTZnWYm/tJ6+tjTQiuAezZh3bwuMvAo=
- secure: eP2CEhjE6YEgajudRcW6Lsyy92IxAB1KS5Cw0p/defwpouSuZS4NF8+YjcUhfI9sbkobL6KGaL12CYqLWToepQpiDHJ1eRaH+/8HQ+kgqwLxmHptVlqEXhkQPVJL04MvxZqeXocuOluGlWHOHMdlmDTA7eI/tKJtyykIRKyXFAc=
- secure: TP/mMjN910q8M/tknHkPxdYfKl25eQqdSscfTlQlnBxJpQgrgX25WgK1XuNI+IUTTmn1cM/eVRyKvUWflxqzwSUhgWO7s1EcN18WYU7Xl+RkWaoOMjqzV3q5l4M8rDK8LiBM/xrcz/rQMTZnWYm/tJ6+tjTQiuAezZh3bwuMvAo=
7 changes: 7 additions & 0 deletions CHANGELOG
@@ -1,3 +1,10 @@
Version 0.9.0 (2020-07-17)
--------------------------
Replace Vagrant with Docker based development experience (#150)
Update project to use go mod instead of dep (#151)
Update Copyright to 2015-2020 (#152)
Add Snyk Integration (#154)

Version 0.8.0 (2018-11-08)
--------------------------
Add support for BigQuery (#92)
Expand Down
169 changes: 0 additions & 169 deletions Gopkg.lock

This file was deleted.

0 comments on commit 7ae0cad

Please sign in to comment.