Skip to content

Commit

Permalink
fix: Rebase cleanup (#2063)
Browse files Browse the repository at this point in the history
rebase cleanup
  • Loading branch information
dpaasman00 authored and Caleb-Hurshman committed Dec 17, 2024
1 parent f1caa87 commit e04e460
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion exporter/chronicleexporter/grpc_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"net"
"testing"

"github.com/observiq/bindplane-agent/exporter/chronicleexporter/protos/api"
"github.com/observiq/bindplane-otel-collector/exporter/chronicleexporter/protos/api"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/consumer/consumererror"
Expand Down
9 changes: 3 additions & 6 deletions scripts/update-module-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.


TARGET_VERSION=$1
if [ -z "$TARGET_VERSION" ]; then
echo "Must specify a target version"
exit 1
fi

LOCAL_MODULES=$(find . -type f -name "go.mod" -exec dirname {} \; | sort)
for local_mod in $LOCAL_MODULES
do
for local_mod in $LOCAL_MODULES; do
# Run in a subshell so that the CD doesn't change this shell's current directory
(
echo "Updating version in $local_mod"
cd "$local_mod" || exit 1
OTEL_MODULES=$(go list -m -f '{{if not (or .Indirect .Main)}}{{.Path}}{{end}}' all |
grep -E -e '^github.com/observiq/bindplane-agent')
grep -E -e '^github.com/observiq/bindplane-otel-collector')

for mod in $OTEL_MODULES
do
for mod in $OTEL_MODULES; do
echo "$local_mod: $mod@$TARGET_VERSION"
go mod edit -require "$mod@$TARGET_VERSION"
done
Expand Down

0 comments on commit e04e460

Please sign in to comment.