From 44ecd787033c7b4ac023080f40cb6281fedc0b22 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Mon, 10 Jun 2024 15:25:42 -0700 Subject: [PATCH 01/17] Updated --- .github/workflows/release.yml | 58 ++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bdd51ed..c0ed468 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,10 @@ on: push: branches: [ "main" ] workflow_dispatch: + inputs: + version: + required: true + description: version jobs: build: @@ -22,29 +26,35 @@ jobs: with: java-version: '11' distribution: 'adopt' - - name: Configure git - run: | - git config --global user.name "${GITHUB_ACTOR}" - git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" - - name: Prepare release - run: mvn --batch-mode release:prepare +# - name: Configure git +# run: | +# git config --global user.name "${GITHUB_ACTOR}" +# git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" +# - name: Prepare release +# run: mvn --batch-mode release:prepare +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Perform release +# run: mvn --batch-mode release:perform +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Set Version + run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B + - name: Deploy + run: mvn deploy -B env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Perform release - run: mvn --batch-mode release:perform - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Figure out the project version from pom.xml - run: | - # Go back to the commit before the SNAPSHOT - git reset --hard HEAD~1 - echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_ENV" - - name: Create Release - uses: actions/create-release@latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: apm-proto-${{ env.VERSION }} - release_name: apm-proto ${{ env.VERSION }} - draft: false - prerelease: false +# - name: Figure out the project version from pom.xml +# run: | +# # Go back to the commit before the SNAPSHOT +# git reset --hard HEAD~1 +# echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_ENV" +# - name: Create Release +# uses: actions/create-release@latest +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# tag_name: apm-proto-${{ env.VERSION }} +# release_name: apm-proto ${{ env.VERSION }} +# draft: false +# prerelease: false From a1726f88cb11b3261047c895de2d0829fb175e5e Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Mon, 10 Jun 2024 15:48:49 -0700 Subject: [PATCH 02/17] Updated --- .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 c0ed468..b338b6d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Set Version run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B - name: Deploy - run: mvn deploy -B + run: mvn deploy -DskipTests -B env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # - name: Figure out the project version from pom.xml From 26462b23c06d1e6633f1f5da932116b13ffe7250 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Mon, 10 Jun 2024 15:51:39 -0700 Subject: [PATCH 03/17] Added debug flag --- .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 b338b6d..05281b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Set Version run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B - name: Deploy - run: mvn deploy -DskipTests -B + run: mvn deploy -DskipTests -B -X env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # - name: Figure out the project version from pom.xml From 58320281b36c9a1e9955322d495559aadc23f2f6 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Mon, 10 Jun 2024 16:01:54 -0700 Subject: [PATCH 04/17] Updated --- .github/workflows/m2/settings.xml | 12 ++++++++++++ .github/workflows/release.yml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/m2/settings.xml diff --git a/.github/workflows/m2/settings.xml b/.github/workflows/m2/settings.xml new file mode 100644 index 0000000..569db43 --- /dev/null +++ b/.github/workflows/m2/settings.xml @@ -0,0 +1,12 @@ + + + + github + ${env.GITHUB_USER} + ${env.GITHUB_TOKEN} + + + \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 05281b9..e7de2f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Set Version run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B - name: Deploy - run: mvn deploy -DskipTests -B -X + run: mvn -s .github/workflows/m2/settings.xml deploy -DskipTests -B -X env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # - name: Figure out the project version from pom.xml From 57ede9a330c653df718fb00c9fd2d4a8d20bbfa2 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 09:38:05 -0700 Subject: [PATCH 05/17] Try --- .github/workflows/m2/settings.xml | 7 +++---- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/m2/settings.xml b/.github/workflows/m2/settings.xml index 569db43..4b594eb 100644 --- a/.github/workflows/m2/settings.xml +++ b/.github/workflows/m2/settings.xml @@ -1,7 +1,6 @@ - + + github diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7de2f6..4901613 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,8 +38,8 @@ jobs: # run: mvn --batch-mode release:perform # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set Version - run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B +# - name: Set Version +# run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B - name: Deploy run: mvn -s .github/workflows/m2/settings.xml deploy -DskipTests -B -X env: From 2412907b3ec332bf3f5599bbd929a161640360a6 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 09:42:38 -0700 Subject: [PATCH 06/17] Updated --- go/collectorpb/go.mod | 2 +- go/collectorpb/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/collectorpb/go.mod b/go/collectorpb/go.mod index 808a87a..c409f57 100644 --- a/go/collectorpb/go.mod +++ b/go/collectorpb/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( google.golang.org/grpc v1.64.0 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 ) require ( diff --git a/go/collectorpb/go.sum b/go/collectorpb/go.sum index d04c591..9240e22 100644 --- a/go/collectorpb/go.sum +++ b/go/collectorpb/go.sum @@ -10,5 +10,5 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= From 9015701a8785b8e231c80b6a428487f25c7cf6a5 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 10:07:57 -0700 Subject: [PATCH 07/17] Updated --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4901613..b2d4d6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,8 +38,10 @@ jobs: # run: mvn --batch-mode release:perform # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# - name: Set Version -# run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B + - name: Set Version + run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B + - name: Install + run: mvn install - name: Deploy run: mvn -s .github/workflows/m2/settings.xml deploy -DskipTests -B -X env: From ca7f704474b0975e03de69f7170627c8f48cddb6 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 10:17:47 -0700 Subject: [PATCH 08/17] try --- .github/workflows/m2/settings.xml | 11 ----------- .github/workflows/release.yml | 31 ++++++++++++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 .github/workflows/m2/settings.xml diff --git a/.github/workflows/m2/settings.xml b/.github/workflows/m2/settings.xml deleted file mode 100644 index 4b594eb..0000000 --- a/.github/workflows/m2/settings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - github - ${env.GITHUB_USER} - ${env.GITHUB_TOKEN} - - - \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2d4d6e..877dd7e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,11 +21,20 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: java-version: '11' - distribution: 'adopt' + distribution: 'temurin' + + - name: Build with Maven + run: mvn -B package --file pom.xml + + - name: Publish to GitHub Packages Apache Maven + run: mvn deploy + env: + GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password + # - name: Configure git # run: | # git config --global user.name "${GITHUB_ACTOR}" @@ -38,14 +47,14 @@ jobs: # run: mvn --batch-mode release:perform # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set Version - run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B - - name: Install - run: mvn install - - name: Deploy - run: mvn -s .github/workflows/m2/settings.xml deploy -DskipTests -B -X - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Set Version +# run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B +# - name: Install +# run: mvn install +# - name: Deploy +# run: mvn -s .github/workflows/m2/settings.xml deploy -DskipTests -B -X +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # - name: Figure out the project version from pom.xml # run: | # # Go back to the commit before the SNAPSHOT From 598143d9beeddca936c2659cb4c6eeaa491493e3 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 10:26:19 -0700 Subject: [PATCH 09/17] Updated --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 877dd7e..3bd54c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,11 +25,11 @@ jobs: - uses: actions/setup-java@v4 with: java-version: '11' - distribution: 'temurin' - + distribution: 'adopt' + - name: Set Version + run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B - name: Build with Maven run: mvn -B package --file pom.xml - - name: Publish to GitHub Packages Apache Maven run: mvn deploy env: From b5cc2d6d70ae0433c3d4b6de3ba2272d5d5283c0 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 11:47:32 -0700 Subject: [PATCH 10/17] Updated --- .github/workflows/release.yml | 30 ++---------------------------- pom.xml | 11 ++--------- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3bd54c7..86c662a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,38 +34,12 @@ jobs: run: mvn deploy env: GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password - -# - name: Configure git -# run: | -# git config --global user.name "${GITHUB_ACTOR}" -# git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" -# - name: Prepare release -# run: mvn --batch-mode release:prepare -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# - name: Perform release -# run: mvn --batch-mode release:perform -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# - name: Set Version -# run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B -# - name: Install -# run: mvn install -# - name: Deploy -# run: mvn -s .github/workflows/m2/settings.xml deploy -DskipTests -B -X -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# - name: Figure out the project version from pom.xml -# run: | -# # Go back to the commit before the SNAPSHOT -# git reset --hard HEAD~1 -# echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_ENV" # - name: Create Release # uses: actions/create-release@latest # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # with: -# tag_name: apm-proto-${{ env.VERSION }} -# release_name: apm-proto ${{ env.VERSION }} +# tag_name: ${{ github.event.inputs.version }} +# release_name: apm-proto ${{ github.event.inputs.version }} # draft: false # prerelease: false diff --git a/pom.xml b/pom.xml index f0bebf1..d491ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,8 @@ 4.0.0 - cloud.solarwindscloud + cloud.solarwinds apm-proto - 1.0.4-SNAPSHOT UTF-8 @@ -116,14 +115,8 @@ github GitHub Packages - https://maven.pkg.github.com/solarwindscloud/apm-proto + https://maven.pkg.github.com/solarwinds/apm-proto - - scm:git:https://github.com/solarwindscloud/apm-proto - scm:git:https://github.com/solarwindscloud/apm-proto - HEAD - - From f314cf63c748cc25d99c7a223933cb8b7ce24fa4 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 11:51:59 -0700 Subject: [PATCH 11/17] Revert --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d491ddd..8ee008f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ cloud.solarwinds apm-proto + 0.0.0-SNAPSHOT UTF-8 From 68b78143b709c824da88e3708a7ad0ee03013004 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 12:16:49 -0700 Subject: [PATCH 12/17] Updated --- .github/workflows/release.yml | 2 +- Makefile | 6 ++---- go/collectorpb/go.mod | 15 --------------- go/collectorpb/go.sum | 14 -------------- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 go/collectorpb/go.mod delete mode 100644 go/collectorpb/go.sum diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86c662a..7f8970e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run make run: make - name: Run make check diff --git a/Makefile b/Makefile index 3ca5a2e..3d7de88 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ pwd := $(shell pwd) -all: clean cpp go mockery doc +all: clean cpp go doc .PHONY: cpp cpp: @@ -12,10 +12,8 @@ go: @echo "Generating apm-library package for Go" @docker run --user `id -u` --rm -v $(PWD):/defs namely/protoc-all:1.51_1 -d . -l go -o go @docker run --rm -v "${PWD}":/apm-proto -w /apm-proto/go/collectorpb golang:1.21.0 sh -c "go mod init github.com/solarwinds/apm-proto/go/collectorpb && go mod tidy" - -.PHONY: mockery -mockery: @docker run --user `id -u` --rm -v "${PWD}/go/collectorpb":/src -w /src vektra/mockery --all --case=underscore + @rm go/collectorpb/go.* .PHONY: doc doc: diff --git a/go/collectorpb/go.mod b/go/collectorpb/go.mod deleted file mode 100644 index c409f57..0000000 --- a/go/collectorpb/go.mod +++ /dev/null @@ -1,15 +0,0 @@ -module github.com/solarwinds/apm-proto/go/collectorpb - -go 1.21.0 - -require ( - google.golang.org/grpc v1.64.0 - google.golang.org/protobuf v1.34.2 -) - -require ( - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect -) diff --git a/go/collectorpb/go.sum b/go/collectorpb/go.sum deleted file mode 100644 index 9240e22..0000000 --- a/go/collectorpb/go.sum +++ /dev/null @@ -1,14 +0,0 @@ -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= From 8a4707db5b35f1773d998fdcccb055bac241f05e Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 12:17:11 -0700 Subject: [PATCH 13/17] Updated --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 59e7bb5..73f645a 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -7,7 +7,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run make run: make - name: Run make check From 0903fe96ee8c6ad0674487ad5c49b91a749ca49b Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 13:40:35 -0700 Subject: [PATCH 14/17] Try --- .github/workflows/release.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f8970e..77861d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,8 @@ name: Release on: push: - branches: [ "main" ] + tags: + - v* workflow_dispatch: inputs: version: @@ -27,7 +28,9 @@ jobs: java-version: '11' distribution: 'adopt' - name: Set Version - run: mvn versions:set -DnewVersion=${{ github.event.inputs.version }} -B + run: | + version=$(echo ${{ github.event.inputs.version }} | sed 's/^v//') + mvn versions:set -DnewVersion=$version -B - name: Build with Maven run: mvn -B package --file pom.xml - name: Publish to GitHub Packages Apache Maven @@ -39,7 +42,7 @@ jobs: # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # with: -# tag_name: ${{ github.event.inputs.version }} -# release_name: apm-proto ${{ github.event.inputs.version }} +# tag_name: ${{ github.ref_name }} +# release_name: apm-proto ${{ github.ref_name }} # draft: false # prerelease: false From 8f5f1fdff3bdfd2bc8aafaf7a827466a88ea6597 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Tue, 11 Jun 2024 14:04:03 -0700 Subject: [PATCH 15/17] Updated --- .github/workflows/release.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77861d4..1d9d77e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,11 +3,6 @@ on: push: tags: - v* - workflow_dispatch: - inputs: - version: - required: true - description: version jobs: build: @@ -29,7 +24,7 @@ jobs: distribution: 'adopt' - name: Set Version run: | - version=$(echo ${{ github.event.inputs.version }} | sed 's/^v//') + version=$(echo ${{ github.ref_name }} | sed 's/^v//') mvn versions:set -DnewVersion=$version -B - name: Build with Maven run: mvn -B package --file pom.xml @@ -37,12 +32,12 @@ jobs: run: mvn deploy env: GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password -# - name: Create Release -# uses: actions/create-release@latest -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# with: -# tag_name: ${{ github.ref_name }} -# release_name: apm-proto ${{ github.ref_name }} -# draft: false -# prerelease: false + - name: Create Release + uses: actions/create-release@latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref_name }} + release_name: apm-proto ${{ github.ref_name }} + draft: false + prerelease: false From 50d80a1a6805c8ad94dcbe3d9b1508bb61fd540a Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Wed, 12 Jun 2024 07:50:18 -0700 Subject: [PATCH 16/17] com --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ee008f..9621156 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - cloud.solarwinds + com.solarwinds apm-proto 0.0.0-SNAPSHOT From 19a4bec3dbebeecb6c9ea4e2430d172c4fe42c79 Mon Sep 17 00:00:00 2001 From: Jerry Leung Date: Wed, 12 Jun 2024 14:45:13 -0700 Subject: [PATCH 17/17] Reverted --- Makefile | 1 - go/collectorpb/go.mod | 15 +++++++++++++++ go/collectorpb/go.sum | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 go/collectorpb/go.mod create mode 100644 go/collectorpb/go.sum diff --git a/Makefile b/Makefile index 3d7de88..265bef2 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ go: @docker run --user `id -u` --rm -v $(PWD):/defs namely/protoc-all:1.51_1 -d . -l go -o go @docker run --rm -v "${PWD}":/apm-proto -w /apm-proto/go/collectorpb golang:1.21.0 sh -c "go mod init github.com/solarwinds/apm-proto/go/collectorpb && go mod tidy" @docker run --user `id -u` --rm -v "${PWD}/go/collectorpb":/src -w /src vektra/mockery --all --case=underscore - @rm go/collectorpb/go.* .PHONY: doc doc: diff --git a/go/collectorpb/go.mod b/go/collectorpb/go.mod new file mode 100644 index 0000000..c409f57 --- /dev/null +++ b/go/collectorpb/go.mod @@ -0,0 +1,15 @@ +module github.com/solarwinds/apm-proto/go/collectorpb + +go 1.21.0 + +require ( + google.golang.org/grpc v1.64.0 + google.golang.org/protobuf v1.34.2 +) + +require ( + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect +) diff --git a/go/collectorpb/go.sum b/go/collectorpb/go.sum new file mode 100644 index 0000000..9240e22 --- /dev/null +++ b/go/collectorpb/go.sum @@ -0,0 +1,14 @@ +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=