Skip to content

Commit

Permalink
Makefile and travis file changes for 1.2.13 version
Browse files Browse the repository at this point in the history
  • Loading branch information
prashanthpx committed May 27, 2024
1 parent c755b2d commit 8461dc1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ script:
- |
if [ -n "${TRAVIS_TAG}" ]; then
export RELEASE_VER=${TRAVIS_TAG}
elif [ "${TRAVIS_BRANCH}" == "master" ]; then
export DOCKER_IMAGE_TAG=master-latest
elif [ "${TRAVIS_BRANCH}" == "1.2.13" ]; then
export DOCKER_IMAGE_TAG=1.2.13
else
export RELEASE_VER=`git rev-parse --short HEAD`
fi
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/dataexport/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -1137,9 +1137,9 @@ func (c *Controller) stageLocalSnapshotRestore(ctx context.Context, dataExport *
}
// Already done with max retries, so moving to kdmp restore anyway
data := updateDataExportDetail{
stage: kdmpapi.DataExportStageTransferScheduled,
status: kdmpapi.DataExportStatusInitial,
reason: "switching to restore from objectstore bucket as restoring from local snapshot did not happen",
stage: kdmpapi.DataExportStageTransferScheduled,
status: kdmpapi.DataExportStatusInitial,
reason: "switching to restore from objectstore bucket as restoring from local snapshot did not happen",
resetLocalSnapshotRestore: true,
}
logrus.Infof("%v: In stageLocalSnapshotRestore stage, local snapshot restore failed, trying KDMP restore.", dataExport.Name)
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const (
//
// These variables typically come from -ldflags settings.
var (
gitVersion = "master-latest"
gitVersion = "1.2.13"
gitCommit = "" // sha1 from git, output of $(git rev-parse HEAD)
buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
kbVerRegex = regexp.MustCompile(`^(v\d+\.\d+\.\d+)(.*)`)
Expand Down

0 comments on commit 8461dc1

Please sign in to comment.