⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an
upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-generic.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with
your project.

The lineage/skeleton branch has one or more unresolved merge conflicts
that you must resolve before merging this pull request!

How to resolve the conflicts

1. Take ownership of this pull request by removing any other assignees.

2. Clone the repository locally, and reapply the merge:

   git clone git@github.com:cisagov/setup-env-github-action.git setup-env-github-action
   cd setup-env-github-action
   git remote add skeleton https://github.com/cisagov/skeleton-generic.git
   git remote set-url --push skeleton no_push
   git switch develop
   git switch --create lineage/skeleton --track origin/develop
   git pull skeleton HEAD
   git status

3. Review the changes displayed by the status command. Fix any conflicts and
   possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the
   branch, commit, and push your changes:

   git add .github/dependabot.yml 
   git commit
   git push --force --set-upstream origin lineage/skeleton

   Note that you may append to the default merge commit message
   that git creates for you, but please do not delete the existing
   content. It provides useful information about the merge that is
   being performed.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All new and existing tests pass.

---

Note

You are seeing this because one of this repository's maintainers has
configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

[mcdonnnj]

Please note that the version is, in an unfriendly way, tracked here:

setup-env-github-action/package.json

Line 40 in 6e90189

"version": "1.0.0"

[jsf9k]

Please note that the version is, in an unfriendly way, tracked here:

setup-env-github-action/package.json

Line 40 in 6e90189

"version": "1.0.0"

Please see commit 04294e4. I tested these changes by bumping the patch version locally, then git rebaseing to remove that commit before pushing.

[mcdonnnj]

LGTM ✔️ I do have one small change I would like to see if it's not too much of a lift.

[mcdonnnj]

I'm having some issues with bump-version. I do not see the version when I run ./bump-version show and the sed command in use does not appear to work with the version of sed that ships with macOS:

$ ./bump-version show

$ sed -n "s/^[[:space:]]*\"version\": \"\(.*\)\",\?$/\1/p" package.json
1.0.0
$ /usr/bin/sed -n "s/^[[:space:]]*\"version\": \"\(.*\)\",\?$/\1/p" package.json

After adding set -x to bump-version I see the following:

$ ./bump-version show
+ VERSION_FILE=package.json
+ VERSION_FILES=("$VERSION_FILE")
++ cat
+ USAGE='Update the version of the project.

Usage:
  bump-version [--push] [--label LABEL] (major | minor | patch | prerelease | build | finalize | show)
  bump-version --list-files
  bump-version (-h | --help)

Options:
  -h | --help    Show this message.
  --push         Perform a `git push` after updating the version.
  --label LABEL  Specify the label to use when updating the build or prerelease version.
  --list-files   List the files that will be updated when the version is bumped.'
++ sed -n 's/^[[:space:]]*"version": "\(.*\)",\?$/\1/p' package.json
+ old_version=
+ old_version_regex='^\([[:space:]]*"version": \)""'
+ new_version=
+ bump_part=
+ label=
+ commit_prefix=Bump
+ with_push=false
+ commands_with_label=("build" "prerelease")
+ commands_with_prerelease=("major" "minor" "patch")
+ with_prerelease=false
+ '[' 1 -eq 0 ']'
+ '[' 1 -gt 0 ']'
+ case $1 in
+ echo ''

+ exit 0

[jsf9k]

I'm having some issues with bump-version. I do not see the version when I run ./bump-version show and the sed command in use does not appear to work with the version of sed that ships with macOS:

bump-version show and bump-version patch both work with GNU sed. Could the problem be the use of the [:space:] character class? Could you try this command using the macOS/BSD version of sed?

$ sed -n "s/^\s*\"version\": \"\(.*\)\",\?$/\1/p" package.json
1.0.0

[mcdonnnj]

I'm having some issues with bump-version. I do not see the version when I run ./bump-version show and the sed command in use does not appear to work with the version of sed that ships with macOS:

bump-version show and bump-version patch both work with GNU sed. Could the problem be the use of the [:space:] character class? Could you try this command using the macOS/BSD version of sed?

$ sed -n "s/^\s*\"version\": \"\(.*\)\",\?$/\1/p" package.json
1.0.0

I believe you're correct and the [:space:] character class is the issue. In my terminal I have sed aliased to gsed (GNU sed) so it works as expected when I try to run the command in my terminal. However, the script is using the BSD sed that macOS ships with which is why I am getting the results I see.

[jsf9k]

I'm having some issues with bump-version.

Please see commit b035dc2.

[mcdonnnj]

I tested the updates to bump-version on my Mac and can confirm the script works as expected.