Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove submodule accidentally added to repo #15103

Merged
merged 6 commits into from
Nov 27, 2024

Conversation

pbrissaud
Copy link
Contributor

What this PR does / why we need it:
Remove submodule file

Which issue(s) this PR fixes:
Fixes #15100

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@pbrissaud pbrissaud requested a review from a team as a code owner November 25, 2024 12:37
@CLAassistant
Copy link

CLAassistant commented Nov 25, 2024

CLA assistant check
All committers have signed the CLA.

@cyriltovena cyriltovena merged commit 38fcef3 into grafana:main Nov 27, 2024
58 checks passed
@pharaujo
Copy link
Contributor

pharaujo commented Jan 7, 2025

@cyriltovena can this fix be backported to the 3.3.x release branch? 3.3.2 still has the ghost submodule reference which breaks submodule checkout:

$ git co v3.3.2
(...)
HEAD is now at 23b5fc2c9 fix: fix the docker driver build (backport release-3.3.x) (#15478)

$ git submodule update --recursive --init --depth=1
fatal: No url found for submodule path '_shared-workflows-dockerhub-login' in .gitmodules

@trevorwhitney trevorwhitney added type/bug Somehing is not working as expected backport release-3.3.x labels Jan 15, 2025
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Jan 15, 2025

The backport to release-3.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-15103-to-release-3.3.x origin/release-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 38fcef3f1a27305ad502927b9f7d4476b118488f

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-15103-to-release-3.3.x
# Create the PR body template
PR_BODY=$(gh pr view 15103 --json body --template 'Backport 38fcef3f1a27305ad502927b9f7d4476b118488f from #15103{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: remove submodule accidentally added to repo (backport release-3.3.x)' --body-file - --label 'size/XS' --label 'type/bug' --label 'backport' --base release-3.3.x --milestone release-3.3.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-15103-to-release-3.3.x

# Create a pull request where the `base` branch is `release-3.3.x` and the `compare`/`head` branch is `backport-15103-to-release-3.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-15103-to-release-3.3.x

trevorwhitney pushed a commit that referenced this pull request Jan 15, 2025
Signed-off-by: Paul Brissaud <[email protected]>
Co-authored-by: Cyril Tovena <[email protected]>
(cherry picked from commit 38fcef3)
@trevorwhitney
Copy link
Collaborator

Backport PR: #15775

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't synchronize ArgoCD App
6 participants