From c42eb3247c5ee1fa1ae9676627335092e586ee4e Mon Sep 17 00:00:00 2001 From: jackgopack4 Date: Tue, 23 Jul 2024 16:51:05 -0400 Subject: [PATCH] revert jackgopack4 repo references --- .github/workflows/prepare-release.yml | 6 +++--- Makefile | 4 ++-- cmd/builder/.goreleaser.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index b6c34be8693..d1287b5f744 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -91,8 +91,8 @@ jobs: # - Run make prepare-release PREVIOUS_VERSION=0.52.0 RELEASE_CANDIDATE=0.53.0 MODSET=beta - name: Prepare release for core env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REPO: jackgopack4/opentelemetry-collector + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + REPO: open-telemetry/opentelemetry-collector CANDIDATE_BETA: ${{ inputs.candidate-beta }} CANDIDATE_STABLE: ${{ inputs.candidate-stable }} CURRENT_BETA: ${{ inputs.current-beta }} @@ -108,5 +108,5 @@ jobs: CANDIDATE_STABLE: ${{ inputs.candidate-stable }} CURRENT_BETA: ${{ inputs.current-beta }} CURRENT_STABLE: ${{ inputs.current-stable }} - REPO: jackgopack4/opentelemetry-collector + REPO: open-telemetry/opentelemetry-collector run: ./.github/workflows/scripts/release-create-tracking-issue.sh diff --git a/Makefile b/Makefile index 2d3dcd706d4..a89ad8e23f4 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,7 @@ genproto-cleanup: # Generate OTLP Protobuf Go files. This will place generated files in PROTO_TARGET_GEN_DIR. genproto: genproto-cleanup mkdir -p ${OPENTELEMETRY_PROTO_SRC_DIR} - curl -sSL https://api.github.com/repos/jackgopack4/opentelemetry-proto/tarball/${OPENTELEMETRY_PROTO_VERSION} | tar xz --strip 1 -C ${OPENTELEMETRY_PROTO_SRC_DIR} + curl -sSL https://api.github.com/repos/open-telemetry/opentelemetry-proto/tarball/${OPENTELEMETRY_PROTO_VERSION} | tar xz --strip 1 -C ${OPENTELEMETRY_PROTO_SRC_DIR} # Call a sub-make to ensure OPENTELEMETRY_PROTO_FILES is populated $(MAKE) genproto_sub $(MAKE) fmt @@ -422,7 +422,7 @@ multimod-prerelease: $(MULTIMOD) $(MAKE) gotidy COMMIT?=HEAD -REMOTE?=git@github.com:jackgopack4/opentelemetry-collector.git +REMOTE?=git@github.com:open-telemetry/opentelemetry-collector.git .PHONY: push-tags push-tags: $(MULTIMOD) $(MULTIMOD) verify diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml index f5ebb3aed60..146f4c5125a 100644 --- a/cmd/builder/.goreleaser.yml +++ b/cmd/builder/.goreleaser.yml @@ -26,7 +26,7 @@ builds: binary: ocb release: github: - owner: jackgopack4 + owner: open-telemetry name: opentelemetry-collector-releases header: | ### Images and binaries here: https://github.com/open-telemetry/opentelemetry-collector-releases/releases/tag/{{ .Tag }}