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 Skeleton Instructions for Development Guide Project Setup #97

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from

Conversation

dv4harr10
Copy link
Contributor

@dv4harr10 dv4harr10 commented Feb 13, 2024

🗣 Description

This PR will update the Documentation Guide Project Setup markdown files instructions to create new skeleton repositories or skeletonize existing repositories.

💭 Motivation and context

These updates are required for uniformity of the cisagov skeleton updates to create and update repositories and to advise on the latest skeletonize tools used.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated
    to reflect the changes in this PR.
  • All new and existing tests pass.

✅ Pre-merge checklist

  • Revert dependencies to default branches.
  • Finalize version.

✅ Post-merge checklist

  • Create a release.

@dv4harr10 dv4harr10 added the documentation This issue or pull request improves or adds to documentation label Feb 13, 2024
@dv4harr10 dv4harr10 self-assigned this Feb 13, 2024
project_setup/README.md Outdated Show resolved Hide resolved
project_setup/README.md Outdated Show resolved Hide resolved
project_setup/README.md Outdated Show resolved Hide resolved
project_setup/README.md Outdated Show resolved Hide resolved
project_setup/README.md Outdated Show resolved Hide resolved
project_setup/skeleton-list.md Outdated Show resolved Hide resolved
project_setup/skeleton-list.md Outdated Show resolved Hide resolved
project_setup/skeletonize-existing-repository.md Outdated Show resolved Hide resolved
project_setup/skeletonize-existing-repository.md Outdated Show resolved Hide resolved
project_setup/skeletonize-existing-repository.md Outdated Show resolved Hide resolved
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

Approved, but with one small item noted.

@jsf9k
Copy link
Member

jsf9k commented Feb 16, 2024

Let's get @mcdonnnj's review before merging.

@michaelsaki michaelsaki linked an issue Feb 16, 2024 that may be closed by this pull request
helper tool included in the [`scripts`](scripts) directory can quickly setup
a new local repository. Once you've cloned and configured the repository
to your local machine, it can be published to a repository created on GitHub.
The [`gh-skeleton`](https://github.com/cisagov/gh-skeleton) GitHub CLI
Copy link
Member

Choose a reason for hiding this comment

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

It looks like we link out to the gh-skeleton repository in multiple places. Please switch this to a reference-style link and update all uses of "gh-skeleton" to both use this link when appropriate and be formatted consistently.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , update to reference-style link. Addressed at 077cfbf

@@ -19,7 +18,7 @@ branch protection - [see our branch protection guide for details](branch-protect
## Contents ##

- [Adding a skeleton configuration to an existing repository](#adding-a-skeleton-configuration-to-an-existing-repository)
- [Using the skeleton tool to start a new repository 💀🛠](#using-the-skeleton-tool-to-start-a-new-repository-)
- [Using the gh-skeleton `gh` extension to start a new repository 💀🛠](#using-the-gh-skeleton-gh-extension-to-start-a-new-repository-)
Copy link
Member

Choose a reason for hiding this comment

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

The emoji no longer make sense.

Suggested change
- [Using the gh-skeleton `gh` extension to start a new repository 💀🛠](#using-the-gh-skeleton-gh-extension-to-start-a-new-repository-)
- [Using the gh-skeleton `gh` extension to start a new repository](#using-the-gh-skeleton-gh-extension-to-start-a-new-repository-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , removed skeleton tool emoji. Addressed at ffbea4a
ffbea4a

```bash
./skeleton list
gh skeleton list
```

```console
Copy link
Member

Choose a reason for hiding this comment

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

Please combine these codeblocks and ensure the sample output aligns with the output of the extension. Please also update the lead-in formatting like so:

```console
$ gh skeleton list

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , updated, replace text at line 54 to 58 Readme.md. Addressed at
ffbea4a


```console
./skeleton clone [options] <parent-repo-name> <new-repo-name>
gh skeleton clone [options] <parent-repo-name> <new-repo-name>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
gh skeleton clone [options] <parent-repo-name> <new-repo-name>
$ gh skeleton clone [options] <parent-repo-name> <new-repo-name>

Copy link
Contributor Author

@dv4harr10 dv4harr10 Feb 28, 2024

Choose a reason for hiding this comment

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

Hi @mcdonnnj , I received 2 linter failed errors for adding the dollar sign prompt, it complains that expected output is required. I worked with Michael on this solution to add the following:

$ gh skeleton clone [options] <parent-repo-name> <new-repo-name>
# Expected output:
# Cloning into 'new-repo-name' .  

Alternatively we may need to omit the dollar sign prompt. What do you suggest?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , the change above satisfied the linter. Addressed at 077cfbf


```console
./skeleton clone [options] <parent-repo-name> <new-repo-name>
gh skeleton clone [options] <parent-repo-name> <new-repo-name>
```

For example, to create a project based on `skeleton-ansible-role` named
`ansible-role-quantum-rng` in your local `~/projects` directory:

```bash
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
```bash
```console

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , updated text line 100. Addressed at
ffbea4a

@@ -1,12 +1,14 @@
# Skeletonize an Existing Repository #

Skeletonizing a repository standardizes our development setup and environment,
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Skeletonizing a repository standardizes our development setup and environment,
Skeletonizing a repository standardizes our development setup and environment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , removed comma at end. of line. Addressed at
ffbea4a

to keep the repository updated and standardized.
and enables our [Lineage GitHub Action](https://github.com/cisagov/action-lineage/)
to keep the repository updated and standardized. The purpose of the
instructions here is to describe how to skeletonize an existing non-skeletonized
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
instructions here is to describe how to skeletonize an existing non-skeletonized
instructions here are to describe how to skeletonize an existing non-skeletonized

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , grammar text update. Addressed at
ffbea4a

1. [Add the skeleton as a remote](#add-a-skeleton-as-remote) to the
non-skeletonized repository
1. [Add the skeleton as a remote](#add-the-skeleton-as-a-remote) to the
existing non-skeletonized repository
1. Pull with `--allow-unrelated-histories`
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
1. Pull with `--allow-unrelated-histories`
1. Pull with `git pull --allow-unrelated-histories skeleton-parent`

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , suggested working update for command. Addressed at
ffbea4a

To see a list of available skeletons, use the `skeleton list` command or see
First, decide which of the available skeletons best fits your
existing non-skeletonized repository. To see a list of available
skeletons, use the `gh skeleton list` command or see
the [list of skeletons](skeleton-list.md).
Copy link
Member

Choose a reason for hiding this comment

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

Are we able to use a link fragment here to link to the appropriate section?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , Can you please elaborate regarding the fragment link required ? From my understanding the 'gh skeleton list' command is to be run at the command line. And the skeleton-list link goes to skeleton-list.md document.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mcdonnnj , update to fragment link. Addressed at 077cfbf

project_setup/skeletonize-existing-repository.md Outdated Show resolved Hide resolved
project_setup/README.md Outdated Show resolved Hide resolved
dv4harr10 and others added 15 commits March 7, 2024 16:28
This commit will remove out-dated
skeleton tool instructions. Previously
the documentation was using a legacy
skeleton tool. Now the instructions
will reflect using the gh CLI
skeleton tool extension. Links
have been updated along with steps
to make a repository from a
skeleton.
Updated naming of gh tool to be more
accurate verbiage from gh CLI extension
to gh skeleton. Updated link to skeleton AWS lambda python which was linked to archived skeleton AWS lambda.
Update naming convention to GitHub CLI 'gh' Extension

Co-authored-by: Shane Frasier <[email protected]>
Co-authored-by: Shane Frasier <[email protected]>
Co-authored-by: Shane Frasier <[email protected]>
This commit updates Development guide
Readme and Skeletonize existing
repository according to requested
changes for wording, grammar,
replacing text and delete emoji.
This commit updates Development guide
links using a reference style for
gh-skeleton links in the Readme file
and directly links to the skeleton list
for skeletonize existing repository file.
This commit fixes some fragment links
that were not working.
Updates to add reference links,
fragment link, and text changes
to skeleton list file.
command promt dollar sign text change
Adding reference link to maintain
consistency of link references globally for
gh-skeleton extension tool.
Referenced skeleton list required update.
add back whitespace to reflect what the user
should expect to see in terminal output.
Redo changes to formatting to reflect what the
user should expect to see in terminal output.
@jsf9k jsf9k force-pushed the documentation/update-skeleton-instructions branch from 8513d28 to 201b4c7 Compare March 7, 2024 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation This issue or pull request improves or adds to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update instructions for project setup
4 participants