From 33555edbf4d03f4ed477960999562c73d11b0264 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 27 Nov 2023 17:15:12 +0300 Subject: [PATCH 1/6] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd6d345..1725399 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@main + - uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 From 588bfa192a32df0105801659c5c0f498f1aeb1f1 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 27 Nov 2023 17:38:45 +0300 Subject: [PATCH 2/6] Update release.yml Suggestion from https://stackoverflow.com/a/67059629 --- .github/workflows/release.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1725399..9ee13d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,20 @@ jobs: uses: actions/setup-go@v4 with: go-version: ^1.21.4 - + + # Update references + - name: Git Sumbodule Update + run: | + git pull --recurse-submodules + git submodule update --remote --recursive + + - name: Commit update + run: | + git config --global user.name 'Git bot' + git config --global user.email 'bot@noreply.github.com' + git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} + git commit -am "Auto updated submodule references" && git push || echo "No changes to commit" + - name: Build run: ./build env: From a2e04b95d8c9cd2cc71563d072cdea9c3d095e2d Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 27 Nov 2023 17:57:23 +0300 Subject: [PATCH 3/6] Update release.yml --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ee13d7..0105b06 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,7 @@ jobs: # Update references - name: Git Sumbodule Update run: | + git checkout main git pull --recurse-submodules git submodule update --remote --recursive From e594aa2febd86835c699f3abe60fb0bfc5dfbcc5 Mon Sep 17 00:00:00 2001 From: Git bot Date: Mon, 27 Nov 2023 14:57:57 +0000 Subject: [PATCH 4/6] Auto updated submodule references --- percona-toolkit | 2 +- pmm-dump | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/percona-toolkit b/percona-toolkit index 28fbbc4..0d10bc9 160000 --- a/percona-toolkit +++ b/percona-toolkit @@ -1 +1 @@ -Subproject commit 28fbbc42bf1029bf9c4d9c0c562292174defbf9a +Subproject commit 0d10bc96b8d1fed9b1c6afc12f1f2233fa840f32 diff --git a/pmm-dump b/pmm-dump index 4cc3350..0d49b27 160000 --- a/pmm-dump +++ b/pmm-dump @@ -1 +1 @@ -Subproject commit 4cc3350b5ec86c8bfe56c5dc2f207cd5f884fb9d +Subproject commit 0d49b27729506dc62950f9fa59147d63df194db2 From 064fde9ef4c76fda42e2c74d3b7d02112ac353f5 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 27 Nov 2023 18:08:44 +0300 Subject: [PATCH 5/6] Build file updated, so it includes version for Percona Toolkit --- build | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/build b/build index 41f77bd..3bcfe0f 100755 --- a/build +++ b/build @@ -9,28 +9,37 @@ function d { echo "[ $(date) ] $1" } -function ldflags { +function ldflags_pmm_dump { BRANCH=$(git branch --show-current) COMMIT=$(git rev-parse --short HEAD) - VERSION=$(git describe --tags --abbrev=0) + VERSION=$(git describe --tags --abbrev=0) echo "-X 'main.GitBranch=${BRANCH}' -X 'main.GitCommit=${COMMIT}' -X 'main.GitVersion=${VERSION}'" } +function ldflags_pt { + CP=')' + VERSION=$(git log --no-walk --tags --pretty="%H %d" --decorate=short | head -n1 | awk -F'[, $(CP)]' '{ print $5; }') + BUILD=$(date "+%FT%T%z") + GOVERSION=$(go version | cut --delimiter=" " -f3) + COMMIT=$(git rev-list -1 HEAD) + echo "-X main.Version=${VERSION} -X main.Build=${BUILD} -X main.GoVersion=${GOVERSION} -X main.Commit=${COMMIT} -s -w" +} + for os_ in ${OS[@]}; do for arch_ in ${ARCH[@]}; do test $( go tool dist list | grep -wc $os_/$arch_ ) -ne 1 && continue test "$os_/$arch_" == "windows/arm" && continue; cd pmm-dump d "Building pmm-dump on $os_/$arch_" - GOOS=${os_} GOARCH=${arch_} go build -ldflags "$(ldflags)" -o ../dist/pmm-dump.${os_}.${arch_} pmm-dump/cmd/pmm-dump + GOOS=${os_} GOARCH=${arch_} go build -ldflags "$(ldflags_pmm_dump)" -o ../dist/pmm-dump.${os_}.${arch_} pmm-dump/cmd/pmm-dump cd .. cd percona-toolkit/src/go for pkg in pt-k8s-debug-collector pt-mongodb-index-check pt-mongodb-query-digest pt-mongodb-summary pt-pg-summary pt-secure-collect; do - d "Building $pkg on $os_/$arch_" - GOOS=${os_} GOARCH=${arch_} go build -ldflags "$(ldflags)" -o ../../../dist/${pkg}.${os_}.${arch_} ./${pkg} + d "Building $pkg on $os_/$arch_" + GOOS=${os_} GOARCH=${arch_} go build -ldflags "$(ldflags_pt)" -o ../../../dist/${pkg}.${os_}.${arch_} ./${pkg} done; cd ../../.. done; -done; \ No newline at end of file +done; From 4e98383cd06174d1548e0dfc83bad084319d8e07 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 27 Nov 2023 18:25:14 +0300 Subject: [PATCH 6/6] Update build --- build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build b/build index 3bcfe0f..6bae0dd 100755 --- a/build +++ b/build @@ -17,12 +17,12 @@ function ldflags_pmm_dump { } function ldflags_pt { - CP=')' - VERSION=$(git log --no-walk --tags --pretty="%H %d" --decorate=short | head -n1 | awk -F'[, $(CP)]' '{ print $5; }') - BUILD=$(date "+%FT%T%z") - GOVERSION=$(go version | cut --delimiter=" " -f3) - COMMIT=$(git rev-list -1 HEAD) - echo "-X main.Version=${VERSION} -X main.Build=${BUILD} -X main.GoVersion=${GOVERSION} -X main.Commit=${COMMIT} -s -w" + CP=')' + VERSION=$(git log --no-walk --tags --pretty="%H %d" --decorate=short | head -n1 | awk -F'[, $(CP)]' '{ print $5; }') + BUILD=$(date "+%FT%T%z") + GOVERSION=$(go version | cut --delimiter=" " -f3) + COMMIT=$(git rev-list -1 HEAD) + echo "-X main.Version=${VERSION} -X main.Build=${BUILD} -X main.GoVersion=${GOVERSION} -X main.Commit=${COMMIT} -s -w" } for os_ in ${OS[@]}; do