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

Sup-4590 - Deprecation of set_cache_paths_to_default task [st0236] #169

Conversation

Aaronoftheages
Copy link
Contributor

@Aaronoftheages Aaronoftheages commented Oct 31, 2023

SUp-4590 - Deprecation of st0236_set_cache_paths_to_default

Add deprecation notice to both task/st0236_set_cache_paths_to_default.rb and st0236_clean_cert.json

image

@Aaronoftheages Aaronoftheages added the enhancement New feature or request label Oct 31, 2023
@Aaronoftheages Aaronoftheages requested a review from a team as a code owner October 31, 2023 12:05
@Aaronoftheages Aaronoftheages changed the title Sup 4590 deprecate st0236 set cache paths to default Sup 4590 - Deprecation of set_cache_paths_to_default task [st0236] Oct 31, 2023
Copy link
Contributor

@m0dular m0dular left a comment

Choose a reason for hiding this comment

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

We should also update the README with a reference to the puppet_conf task which can replace this one's functionality.

tasks/st0236_set_cache_paths_to_default.sh Outdated Show resolved Hide resolved
tasks/st0236_set_cache_paths_to_default.sh Outdated Show resolved Hide resolved
@Aaronoftheages Aaronoftheages force-pushed the SUP-4590_Deprecate_ST0236_set_cache_paths_to_default branch from a56d590 to 82d22b6 Compare November 1, 2023 16:49
@m0dular
Copy link
Contributor

m0dular commented Nov 1, 2023

@Aaronoftheages There should never be a need to merge main, or whatever upstream branch you base your feature branch on, back into the feature branch. You can set this to avoid it in the future, and it's a good idea 99% of the time anyway.

git config --global pull.rebase true

To fix this branch you can do this, assuming upstream is what the puppetlabs remote is named for you.

git checkout SUP-4590_Deprecate_ST0236_set_cache_paths_to_default
git pull --rebase upstream main -X theirs
git push -f

Other than that, we just need a link to the puppet_conf task as an alternative in the README.

@Aaronoftheages Aaronoftheages force-pushed the SUP-4590_Deprecate_ST0236_set_cache_paths_to_default branch from e696697 to 388e622 Compare November 2, 2023 09:52
@Aaronoftheages Aaronoftheages force-pushed the SUP-4590_Deprecate_ST0236_set_cache_paths_to_default branch from e38b251 to 7519aa9 Compare November 2, 2023 10:11
@Aaronoftheages Aaronoftheages changed the title Sup 4590 - Deprecation of set_cache_paths_to_default task [st0236] Sup-4590 - Deprecation of set_cache_paths_to_default task [st0236] Nov 2, 2023
@m0dular m0dular merged commit f6c86e8 into puppetlabs:main Nov 3, 2023
31 checks passed
@Aaronoftheages Aaronoftheages deleted the SUP-4590_Deprecate_ST0236_set_cache_paths_to_default branch November 6, 2023 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants