diff --git a/.drone.yml b/.drone.yml index e49f7c169..fb024b30b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,7 +46,7 @@ pipeline: image: plugins/docker repo: drone/drone secrets: [ docker_username, docker_password ] - tag: [ 0.6, 0.6.0 ] + tag: [ 0.7, 0.7.0 ] when: event: tag diff --git a/server/rpc.go b/server/rpc.go index 702d8ecab..c72cb20f4 100644 --- a/server/rpc.go +++ b/server/rpc.go @@ -96,7 +96,16 @@ func RPCHandler(c *gin.Context) { c.Request.Header.Get("X-Drone-Version"), ) logrus.Debugf("agent connected: ip address %s: version %s", c.ClientIP(), agent) - if agent.LessThan(version.Version) { + // if agent.LessThan(version.Version) { + // logrus.Warnf("Version mismatch. Agent version %s < Server version %s", agent, version.Version) + // c.String(409, "Version mismatch. Agent version %s < Server version %s", agent, version.Version) + // return + // } + + switch agent.Minor { + case 6, 7: + // these versions are ok + default: logrus.Warnf("Version mismatch. Agent version %s < Server version %s", agent, version.Version) c.String(409, "Version mismatch. Agent version %s < Server version %s", agent, version.Version) return diff --git a/version/version.go b/version/version.go index 48beb8142..cdca54675 100644 --- a/version/version.go +++ b/version/version.go @@ -6,7 +6,7 @@ var ( // VersionMajor is for an API incompatible changes VersionMajor int64 // VersionMinor is for functionality in a backwards-compatible manner - VersionMinor int64 = 6 + VersionMinor int64 = 7 // VersionPatch is for backwards-compatible bug fixes VersionPatch int64 // VersionPre indicates prerelease