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

⚠️ CONFLICT! Lineage pull request for: skeleton #29

Merged
merged 71 commits into from
Feb 9, 2023
Merged

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Jan 7, 2023

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-python-library.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/aws-profile-sync.git aws-profile-sync
    cd aws-profile-sync
    git remote add skeleton https://github.com/cisagov/skeleton-python-library.git
    git remote set-url --push skeleton no_push
    git switch develop
    git checkout -b 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 README.md src/aws_profile_sync/_version.py 
    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. Check the "Everything is cool" checkbox below:

    • ✌️ The conflicts in this pull request have been resolved.
  7. Mark this draft pull request "Ready for review".


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 and others added 30 commits May 27, 2022 18:04
Additionally as of v3.1.0 of actions/setup-go there is a go-version
output value to retrieve the version of Go installed by the Action.
This allows us to remove the step to manually retrieve this information
from the Go executable.
Go 1.16 is no longer supported as of the release of 1.18 so it makes
sense to update to the latest version available.
Go 1.19 was released while this branch was in the wings and it makes
sense to bump to the latest Go release.
Update Go installation in the `build.yml` workflow
Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 1 to 2.
- [Release notes](https://github.com/hashicorp/setup-terraform/releases)
- [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md)
- [Commits](hashicorp/setup-terraform@v1...v2)

---
updated-dependencies:
- dependency-name: hashicorp/setup-terraform
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…orp/setup-terraform-2

Bump hashicorp/setup-terraform from 1 to 2
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/setup-python-4

Bump actions/setup-python from 3 to 4
Add a comment that states that the commented out ignore directives are
managed by cisagov/skeleton-generic.
This adds the other versioned Actions that should be managed by
cisagov/skeleton-generic to the list of commented out dependencies to
ignore.
GitHub has deprecated the set-output command per:
https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/

This updates the GitHub Actions workflow to use the newly preferred
method to set the output for a job's step.
Remove usage of `set-output` from our GitHub Actions workflow
Increase the line length maximum from the default of 80 to 88. This 10%
increase mirrors the line length allowed in other linter configurations
such as black.
…-length_rules

Update the `line-length` configuration for `yamllint`
Per PyCQA/flake8#1290 this hook moved from GitLab to GitHub. The
version we use is bumped to the latest tag on GitHub as well.
Update the `flake8` pre-commit hook configuration
Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook
is intentionally held back due to issues with upgrading to v6.
This configuration file stores information about the labels expected in
this repository.
This adds a workflow to ensure that the repository labels are updated
to reflect changes to the label configuration file .github/labels.yml.
Update the configuration for repository labels to remove the leading
`#` from color values. With a `#` leading the values they are seen as
invalid by the GitHub API.
There was a missing empty line in the `.yamllint` file between two rule
definitions.
There is no Python 3.6 on Ubuntu 22.04 release available from
actions/python-versions. Since Ubuntu 22.04 is what is being used for
the `ubuntu-latest` tag we need to pin Python 3.6 testing to use the
old `ubuntu-20.04` tag.
@jsf9k jsf9k marked this pull request as ready for review January 23, 2023 20:36
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.

👍 👍

@jsf9k jsf9k requested a review from a team January 24, 2023 21:30
mcdonnnj and others added 14 commits January 31, 2023 13:06
Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook
is intentionally held back to be updated independently to v6.
Lineage pull request for: skeleton
Retrieve the wheel to a `dist/` sub-directory and get the name of the
specific file (wheel) to be installed. Then update the installation
step to use this found filename instead of a wildcard.
When installing the wheel that was built in the `build` job we will
also install the `test` optional dependencies.
…ncies_in_test-build_gha_job

Improve testing dependency installation in the `test-build` job
Sort all pre-`steps` keys alphabetically descending. Sorting all keys
alphabetically would be somewhat onerous because the `strategy` key
would come after the `steps` key even though it's configuration
information. We can at least sort everything but the `steps` key in
alphabetically descending order and make the `steps` the last for a
job.
Add `name` keys to the `test`, `build`, and `test-build` jobs that are
both more descriptive and include the Python version from the job's
matrix. This will produce consistent and more helpful job names in the
GitHub Actions log in the GitHub web UI.
…s_using_matrix_strategy

Improve job names for the `build` workflow in GitHub Actions
@jsf9k jsf9k requested a review from dav3r February 8, 2023 19:41
Copy link
Member

@mcdonnnj mcdonnnj left a comment

Choose a reason for hiding this comment

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

Reminder to please create a tag or release post-merge.

@jsf9k jsf9k merged commit 8c15401 into develop Feb 9, 2023
@jsf9k jsf9k deleted the lineage/skeleton branch February 9, 2023 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream update This issue or pull request pulls in upstream updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants