From e026b82c72bb004716194416d95aa4c3b3040ad5 Mon Sep 17 00:00:00 2001 From: Mark Mandel Date: Wed, 30 Nov 2022 14:08:09 -0800 Subject: [PATCH] Fixes for version data. initial commit for automating version testing version changes testing version changes testing version changes testing version changes issue-2457 changes issue-2457 release version automation automate version Testing automation in docker Testing automation in docker Testing automation in docker Testing automation in docker Testing automation in docker Testing automation in docker Testing automation in docker Testing automation in docker Testing automation in docker Debug automation using docker Debug automation using docker Debug automation using docker Debug automation using docker Debug automation using docker Debug automation using docker Debug automation using docker lint error fixed review changes Resolved Merge conflicts updated go mod file Added GOFLAGS argument and Apache header license Added GOFLAGS argument and Apache header license Added GOFLAGS argument and Apache header license Added GOFLAGS argument and Apache header license Fixes for version data. --- build/includes/release.mk | 5 +++-- go.mod | 1 + go.sum | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build/includes/release.mk b/build/includes/release.mk index 5f3f570bc3..5a5e59664f 100644 --- a/build/includes/release.mk +++ b/build/includes/release.mk @@ -56,9 +56,10 @@ example-image-markdown.%: # Deploys the site by taking in the base version and deploying the previous version release-deploy-site: $(ensure-build-image) -release-deploy-site: DOCKER_RUN_ARGS += GOFLAGS="-mod=mod" --entrypoint=/usr/local/go/bin/go +release-deploy-site: DOCKER_RUN_ARGS += -e GOFLAGS="-mod=mod" --entrypoint=/usr/local/go/bin/go release-deploy-site: - version=$$($(DOCKER_RUN) run $(mount_path)/build/scripts/previousversion/main.go -version $(base_version)) \ + version=$$($(DOCKER_RUN) run $(mount_path)/build/scripts/previousversion/main.go -version $(base_version)) && \ + echo "Deploying Site Version: $$version" && \ $(MAKE) site-deploy SERVICE=$$version # Creates a release. Version defaults to the base_version diff --git a/go.mod b/go.mod index f45a5e2c78..1755e2a6eb 100644 --- a/go.mod +++ b/go.mod @@ -46,6 +46,7 @@ require ( github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/aws/aws-sdk-go v1.16.20 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect diff --git a/go.sum b/go.sum index 789224f85a..8d3c2b52f0 100644 --- a/go.sum +++ b/go.sum @@ -85,7 +85,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=