From bcea155fa8edb103c76e371dfdc1fe04591e2e72 Mon Sep 17 00:00:00 2001 From: coffeegoddd Date: Mon, 15 Apr 2024 10:56:09 -0700 Subject: [PATCH] /{.github,go}: fix path to dolt version in release stuff --- .github/workflows/cd-release-pgo.yaml | 2 +- go/utils/publishrelease/buildbinaries.sh | 2 +- go/utils/publishrelease/buildpgobinaries.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-release-pgo.yaml b/.github/workflows/cd-release-pgo.yaml index 62ce35a7b6..bac1a3c08b 100644 --- a/.github/workflows/cd-release-pgo.yaml +++ b/.github/workflows/cd-release-pgo.yaml @@ -76,7 +76,7 @@ jobs: - uses: EndBug/add-and-commit@v9.1.1 with: message: ${{ format('[ga-bump-release] Update Dolt version to {0} and release v{0}', needs.format-version.outputs.version) }} - add: ${{ format('["{0}/go/cmd/dolt/dolt.go", "{0}/go/cmd/dolt/commands/sqlserver/yaml_config.go", "{0}/go/cmd/dolt/commands/sqlserver/testdata/minver_validation.txt"]', github.workspace) }} + add: ${{ format('["{0}/go/cmd/dolt/doltversion/version.go", "{0}/go/cmd/dolt/commands/sqlserver/yaml_config.go", "{0}/go/cmd/dolt/commands/sqlserver/testdata/minver_validation.txt"]', github.workspace) }} cwd: "." pull: "--ff" - name: Build PGO Binaries diff --git a/go/utils/publishrelease/buildbinaries.sh b/go/utils/publishrelease/buildbinaries.sh index ece2aa477b..19377f0fa0 100755 --- a/go/utils/publishrelease/buildbinaries.sh +++ b/go/utils/publishrelease/buildbinaries.sh @@ -39,7 +39,7 @@ for tuple in $OS_ARCH_TUPLES; do done render_install_sh() { - local parsed=(`grep "Version = " ./cmd/dolt/dolt.go`) + local parsed=(`grep "Version = " ./cmd/dolt/doltversion/version.go`) local DOLT_VERSION=`eval echo ${parsed[2]}` sed '\''s|__DOLT_VERSION__|'\''"$DOLT_VERSION"'\''|'\'' utils/publishrelease/install.sh } diff --git a/go/utils/publishrelease/buildpgobinaries.sh b/go/utils/publishrelease/buildpgobinaries.sh index 254b930af2..9abf0e1d29 100755 --- a/go/utils/publishrelease/buildpgobinaries.sh +++ b/go/utils/publishrelease/buildpgobinaries.sh @@ -40,7 +40,7 @@ for tuple in $OS_ARCH_TUPLES; do done render_install_sh() { - local parsed=(`grep "Version = " ./cmd/dolt/dolt.go`) + local parsed=(`grep "Version = " ./cmd/dolt/doltversion/version.go`) local DOLT_VERSION=`eval echo ${parsed[2]}` sed '\''s|__DOLT_VERSION__|'\''"$DOLT_VERSION"'\''|'\'' utils/publishrelease/install.sh }