From a2440a0d462402db1544852f58b0c836ea4a5dac Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Wed, 12 Apr 2017 20:26:52 +0200 Subject: [PATCH] update yaml for 0.6 --- .drone.yml | 7 +------ .drone.yml.sig | 1 - Makefile | 16 ++++++++-------- version/version.go | 16 +++++++++------- 4 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 .drone.yml.sig diff --git a/.drone.yml b/.drone.yml index 9e2f4c22f..77d39e307 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,8 +23,6 @@ pipeline: bucket: downloads.drone.io source: release/**/*.* target: /0.6.0/ - access_key: ${AWS_ACCESS_KEY_ID} - secret_key: ${AWS_SECRET_ACCESS_KEY} secrets: [ aws_access_key_id, aws_secret_access_key ] when: event: push @@ -33,8 +31,6 @@ pipeline: publish: image: plugins/docker repo: drone/drone - username: ${DOCKER_USERNAME} - password: ${DOCKER_PASSWORD} secrets: [ docker_username, docker_password ] tag: [ latest, 0.6, 0.6.0, 0.6.0-rc.1 ] when: @@ -43,11 +39,10 @@ pipeline: notify: image: plugins/gitter - webhook: ${GITTER_WEBHOOK} + dummy: true # todo remove this secrets: [ gitter_webhook ] when: status: [ success, failure ] - event: [ push, pull_request ] services: postgres: diff --git a/.drone.yml.sig b/.drone.yml.sig deleted file mode 100644 index b5addf107..000000000 --- a/.drone.yml.sig +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9nbwogIHBhdGg6IHNyYy9naXRodWIuY29tL2Ryb25lL2Ryb25lCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGdvbGFuZzoxLjgKICAgIGNvbW1hbmRzOgogICAgICAtIG1ha2UgZGVwcyBnZW4KICAgICAgLSBtYWtlIHRlc3QgdGVzdF9wb3N0Z3JlcyB0ZXN0X215c3FsCgogIGNvbXBpbGU6CiAgICBpbWFnZTogZ29sYW5nOjEuOAogICAgY29tbWFuZHM6CiAgICAgIC0gZXhwb3J0IFBBVEg9JFBBVEg6L2dvL2JpbgogICAgICAtIG1ha2UgYnVpbGQKICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCgogIGFyY2hpdmU6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgYWNsOiBwdWJsaWMtcmVhZAogICAgYnVja2V0OiBkb3dubG9hZHMuZHJvbmUuaW8KICAgIHNvdXJjZTogcmVsZWFzZS8qKi8qLioKICAgIHRhcmdldDogLzAuNi4wLwogICAgYWNjZXNzX2tleTogJHtBV1NfQUNDRVNTX0tFWV9JRH0KICAgIHNlY3JldF9rZXk6ICR7QVdTX1NFQ1JFVF9BQ0NFU1NfS0VZfQogICAgc2VjcmV0czogWyBhd3NfYWNjZXNzX2tleV9pZCwgYXdzX3NlY3JldF9hY2Nlc3Nfa2V5IF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGRyb25lL2Ryb25lCiAgICB1c2VybmFtZTogJHtET0NLRVJfVVNFUk5BTUV9CiAgICBwYXNzd29yZDogJHtET0NLRVJfUEFTU1dPUkR9CiAgICBzZWNyZXRzOiBbIGRvY2tlcl91c2VybmFtZSwgZG9ja2VyX3Bhc3N3b3JkIF0KICAgIHRhZzogWyBsYXRlc3QsIDAuNiwgMC42LjAsIDAuNi4wLXJjLjEgXQogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKICAgICAgZXZlbnQ6IHB1c2gKCiAgbm90aWZ5OgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCiAgICB3ZWJob29rOiAke0dJVFRFUl9XRUJIT09LfQogICAgc2VjcmV0czogWyBnaXR0ZXJfd2ViaG9vayBdCiAgICB3aGVuOgogICAgICBzdGF0dXM6IFsgc3VjY2VzcywgZmFpbHVyZSBdCiAgICAgIGV2ZW50OiBbIHB1c2gsIHB1bGxfcmVxdWVzdCBdCgpzZXJ2aWNlczoKICBwb3N0Z3JlczoKICAgIGltYWdlOiBwb3N0Z3Jlczo5LjQuNQogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj1wb3N0Z3JlcwogIG15c3FsOgogICAgaW1hZ2U6IG15c3FsOjUuNi4yNwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTVlTUUxfREFUQUJBU0U9dGVzdAogICAgICAtIE1ZU1FMX0FMTE9XX0VNUFRZX1BBU1NXT1JEPXllcwo.703XjM276LvgeEv8UIln1uX606eyIALPCgfdqVgeo54 \ No newline at end of file diff --git a/Makefile b/Makefile index d5070f935..12d0b889f 100644 --- a/Makefile +++ b/Makefile @@ -34,28 +34,28 @@ test: # docker run --publish=3306:3306 -e MYSQL_DATABASE=test -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql:5.6.27 test_mysql: - DATABASE_DRIVER="mysql" DATABASE_CONFIG="root@tcp(127.0.0.1:3306)/test?parseTime=true" go test github.com/drone/drone/store/datastore + DATABASE_DRIVER="mysql" DATABASE_CONFIG="root@tcp(mysql:3306)/test?parseTime=true" go test github.com/drone/drone/store/datastore # docker run --publish=5432:5432 postgres:9.4.5 test_postgres: - DATABASE_DRIVER="postgres" DATABASE_CONFIG="host=127.0.0.1 user=postgres dbname=postgres sslmode=disable" go test github.com/drone/drone/store/datastore + DATABASE_DRIVER="postgres" DATABASE_CONFIG="host=postgres user=postgres dbname=postgres sslmode=disable" go test github.com/drone/drone/store/datastore # build the release files build: build_static build_cross build_tar build_sha build_static: - go install -ldflags '${EXTLDFLAGS}-X github.com/drone/drone/version.VersionDev=$(DRONE_BUILD_NUMBER)' github.com/drone/drone/drone + go install -ldflags '${EXTLDFLAGS}-X github.com/drone/drone/version.VersionDev=build.$(DRONE_BUILD_NUMBER)' github.com/drone/drone/drone mkdir -p release cp $(GOPATH)/bin/drone release/ # TODO this is getting moved to a shell script, do not alter build_cross: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o release/linux/amd64/drone github.com/drone/drone/drone - GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -o release/linux/arm64/drone github.com/drone/drone/drone - GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -o release/linux/arm/drone github.com/drone/drone/drone - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -o release/windows/amd64/drone github.com/drone/drone/drone - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -o release/darwin/amd64/drone github.com/drone/drone/drone + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.$(DRONE_BUILD_NUMBER)' -o release/linux/amd64/drone github.com/drone/drone/drone + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.$(DRONE_BUILD_NUMBER)' -o release/linux/arm64/drone github.com/drone/drone/drone + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.$(DRONE_BUILD_NUMBER)' -o release/linux/arm/drone github.com/drone/drone/drone + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.$(DRONE_BUILD_NUMBER)' -o release/windows/amd64/drone github.com/drone/drone/drone + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.$(DRONE_BUILD_NUMBER)' -o release/darwin/amd64/drone github.com/drone/drone/drone # TODO this is getting moved to a shell script, do not alter build_tar: diff --git a/version/version.go b/version/version.go index 36758ec04..b18003501 100644 --- a/version/version.go +++ b/version/version.go @@ -4,20 +4,22 @@ import "github.com/coreos/go-semver/semver" var ( // VersionMajor is for an API incompatible changes - VersionMajor int64 = 0 + VersionMajor int64 // VersionMinor is for functionality in a backwards-compatible manner VersionMinor int64 = 6 // VersionPatch is for backwards-compatible bug fixes - VersionPatch int64 = 0 - + VersionPatch int64 + // VersionPre indicates prerelease + VersionPre string = "rc.1" // VersionDev indicates development branch. Releases will be empty string. VersionDev string ) // Version is the specification version that the package types support. var Version = semver.Version{ - Major: VersionMajor, - Minor: VersionMinor, - Patch: VersionPatch, - Metadata: VersionDev, + Major: VersionMajor, + Minor: VersionMinor, + Patch: VersionPatch, + PreRelease: semver.PreRelease(VersionPre), + Metadata: VersionDev, }