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

Update gradle command to remove gitignored files #26924

Merged
merged 5 commits into from
Jun 2, 2023

Conversation

bnchrch
Copy link
Contributor

@bnchrch bnchrch commented Jun 1, 2023

What

  1. Updates our gitignore to be a little more specific
  2. Updates gradle to remove files that should be removed by gitignore

@CLAassistant
Copy link

CLAassistant commented Jun 1, 2023

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ bnchrch
❌ Octavia Squidington III


Octavia Squidington III seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@bnchrch bnchrch force-pushed the bnchrch/remove-registry-again branch from b5efe6b to b802416 Compare June 1, 2023 21:13
@bnchrch bnchrch requested review from cpdeethree and a team June 1, 2023 21:37
@bnchrch
Copy link
Contributor Author

bnchrch commented Jun 1, 2023

@cpdeethree You can see in the automated change commit that we removed the oss_registry and only the oss_registry

d0c4657

Comment on lines 325 to 327
- name: Remove any files that have been gitignored
run: git ls-files -i -c --exclude-from=.gitignore | xargs git rm --cached

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I understand the purpose of it but do you want it to be permanent?

Copy link
Contributor Author

@bnchrch bnchrch Jun 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh so badly I want it to be permanent!

Here's some more context on this
https://airbytehq-team.slack.com/archives/C03VDJ4FMJB/p1685647715073319

Basically multiple times now I've

  1. git rm --cached airbyte-config-oss/init-oss/src/main/resources/seed/oss_registry.json
  2. Double checked its in the gitignore
  3. Removed the file from my local filesystem
  4. Run process resources locally
  5. Double check the file exists but git is not tracking it
  6. Merged these changes to master.

However if there exists a PR that

  1. Is out of date from master after the above changes (all of them)
  2. Has a commit that changes the oss_registry.json (some of them)
  3. Is merged before updating to latest. (often)

That work gets undone as the file is readded, and currently tracked files do not adhere to the gitignore 😢

@bnchrch bnchrch force-pushed the bnchrch/remove-registry-again branch from 63895c7 to e92c5a1 Compare June 2, 2023 00:38
@bnchrch bnchrch enabled auto-merge (squash) June 2, 2023 01:33
@bnchrch bnchrch merged commit 68e4d50 into master Jun 2, 2023
18 of 19 checks passed
@bnchrch bnchrch deleted the bnchrch/remove-registry-again branch June 2, 2023 02:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants