From 37c399b90c22319d75c574ed02ac2b04e57dbd9c Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 17 Oct 2023 13:50:37 -0400 Subject: [PATCH 1/9] fix nrmongo test and nrnats test --- .github/workflows/ci.yaml | 1 - v3/build-script.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2e3b02c6d..a97c4d5e4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -137,7 +137,6 @@ jobs: dirs: v3/integrations/nrb3 - go-version: 1.19.x dirs: v3/integrations/nrmongo - extratesting: go get -u go.mongodb.org/mongo-driver@master - go-version: 1.19.x dirs: v3/integrations/nrgraphqlgo,v3/integrations/nrgraphqlgo/example extratesting: go get -u github.com/graphql-go/graphql@master diff --git a/v3/build-script.sh b/v3/build-script.sh index ee85bb008..780c72611 100755 --- a/v3/build-script.sh +++ b/v3/build-script.sh @@ -44,7 +44,7 @@ for dir in $DIRS; do go mod edit -replace github.com/newrelic/go-agent/v3="$pwd"/v3 # manage dependencies - go mod tidy -go=$shortVersion -compat=$shortVersion + GOPROXY=direct go mod tidy -go=$shortVersion -compat=$shortVersion pin_go_dependency "$PIN" # run tests From 908226e1551abd3644823855495e5230988f4168 Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 17 Oct 2023 14:01:52 -0400 Subject: [PATCH 2/9] replace old arm64 go link with current one --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a97c4d5e4..4e55aac23 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -200,7 +200,7 @@ jobs: install: | DEBIAN_FRONTEND=noninteractive apt-get -qq update DEBIAN_FRONTEND=noninteractive apt-get -qq install -y wget build-essential - wget -nv https://golang.org/dl/go${{ matrix.go-version }}.linux-arm64.tar.gz + wget -nv https://go.dev/dl/go${{ matrix.go-version }}.linux-arm64.tar.gz rm -rf /usr/local/go tar -C /usr/local -xzf go${{ matrix.go-version }}.linux-arm64.tar.gz run: | From 604dd638768555d4ce7c484a126b08913780fbb1 Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 17 Oct 2023 14:17:54 -0400 Subject: [PATCH 3/9] target nats with goproxy direct --- .github/workflows/ci.yaml | 1 + v3/build-script.sh | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4e55aac23..ff67a490d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -117,6 +117,7 @@ jobs: - go-version: 1.19.x dirs: v3/integrations/nrnats extratesting: go get -u github.com/nats-io/nats.go/@master + goproxy: direct - go-version: 1.19.x dirs: v3/integrations/nrstan extratesting: go get -u github.com/nats-io/stan.go/@master diff --git a/v3/build-script.sh b/v3/build-script.sh index 780c72611..66eae3f9a 100755 --- a/v3/build-script.sh +++ b/v3/build-script.sh @@ -44,7 +44,12 @@ for dir in $DIRS; do go mod edit -replace github.com/newrelic/go-agent/v3="$pwd"/v3 # manage dependencies - GOPROXY=direct go mod tidy -go=$shortVersion -compat=$shortVersion + if [ $goproxy -eq "direct" ]; then + GOPROXY=direct go mod tidy -go=$shortVersion -compat=$shortVersion + else + go mod tidy -go=$shortVersion -compat=$shortVersion + fi + pin_go_dependency "$PIN" # run tests From d6cfec82df52424af68e7cb2b0ef5d0505511d3e Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 17 Oct 2023 14:28:41 -0400 Subject: [PATCH 4/9] bad bash --- v3/build-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/build-script.sh b/v3/build-script.sh index 66eae3f9a..71ebe5c0b 100755 --- a/v3/build-script.sh +++ b/v3/build-script.sh @@ -44,7 +44,7 @@ for dir in $DIRS; do go mod edit -replace github.com/newrelic/go-agent/v3="$pwd"/v3 # manage dependencies - if [ $goproxy -eq "direct" ]; then + if [[ "$goproxy" -eq "direct" ]]; then GOPROXY=direct go mod tidy -go=$shortVersion -compat=$shortVersion else go mod tidy -go=$shortVersion -compat=$shortVersion From 6a63cdc84a8029e0da9b5fa51e1be397a6a27c3e Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 17 Oct 2023 14:36:34 -0400 Subject: [PATCH 5/9] bad bash part 2 --- v3/build-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/build-script.sh b/v3/build-script.sh index 71ebe5c0b..1ef8f8769 100755 --- a/v3/build-script.sh +++ b/v3/build-script.sh @@ -44,7 +44,7 @@ for dir in $DIRS; do go mod edit -replace github.com/newrelic/go-agent/v3="$pwd"/v3 # manage dependencies - if [[ "$goproxy" -eq "direct" ]]; then + if [ "$goproxy" = "direct" ]; then GOPROXY=direct go mod tidy -go=$shortVersion -compat=$shortVersion else go mod tidy -go=$shortVersion -compat=$shortVersion From a4a45c25374163c54539490c4da117ccbd4877bf Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 17 Oct 2023 14:57:22 -0400 Subject: [PATCH 6/9] final goproxy solution: --- .github/workflows/ci.yaml | 1 + v3/build-script.sh | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ff67a490d..fa5d5bdb4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -168,6 +168,7 @@ jobs: DIRS: ${{ matrix.dirs }} EXTRATESTING: ${{ matrix.extratesting }} PIN: ${{ matrix.pin }} + GOPROXY: ${{ matrix.goproxy }} - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/v3/build-script.sh b/v3/build-script.sh index 1ef8f8769..ee85bb008 100755 --- a/v3/build-script.sh +++ b/v3/build-script.sh @@ -44,12 +44,7 @@ for dir in $DIRS; do go mod edit -replace github.com/newrelic/go-agent/v3="$pwd"/v3 # manage dependencies - if [ "$goproxy" = "direct" ]; then - GOPROXY=direct go mod tidy -go=$shortVersion -compat=$shortVersion - else - go mod tidy -go=$shortVersion -compat=$shortVersion - fi - + go mod tidy -go=$shortVersion -compat=$shortVersion pin_go_dependency "$PIN" # run tests From fa926b94a68999f1c19ebdf9860e2ee7fc3429e1 Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Tue, 17 Oct 2023 15:05:13 -0400 Subject: [PATCH 7/9] bug in nats extratesting --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa5d5bdb4..e12881302 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -116,7 +116,7 @@ jobs: # If we are using the latest released version to test, we need to use a newer version of go - go-version: 1.19.x dirs: v3/integrations/nrnats - extratesting: go get -u github.com/nats-io/nats.go/@master + extratesting: go get -u github.com/nats-io/nats.go@master goproxy: direct - go-version: 1.19.x dirs: v3/integrations/nrstan From e661752be3927d9c8b0c4a5b92f63cc3f869d8e0 Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Wed, 18 Oct 2023 11:55:26 -0400 Subject: [PATCH 8/9] bump actions for setting up go --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e12881302..6bb178104 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -147,7 +147,7 @@ jobs: steps: - name: Install Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 with: go-version: ${{ matrix.go-version }} From 5a5b53d7cea018dfecfb33c167e0d0d5ddbb284b Mon Sep 17 00:00:00 2001 From: Emilio Garcia Date: Thu, 19 Oct 2023 10:50:44 -0400 Subject: [PATCH 9/9] Update ci.yaml upgrade nats to latest stable version, not master branch (doesn't exist) --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6bb178104..a7debd44e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -116,7 +116,7 @@ jobs: # If we are using the latest released version to test, we need to use a newer version of go - go-version: 1.19.x dirs: v3/integrations/nrnats - extratesting: go get -u github.com/nats-io/nats.go@master + extratesting: go get -u github.com/nats-io/nats.go goproxy: direct - go-version: 1.19.x dirs: v3/integrations/nrstan