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

cisagovbot · 2022-11-22T00:32:03Z

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-docker.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

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

Clone the repository locally, and reapply the merge:

git clone [email protected]:cisagov/javadebian11-docker.git javadebian11-docker
cd javadebian11-docker
git remote add skeleton https://github.com/cisagov/skeleton-docker.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

Review the changes displayed by the status command. Fix any conflicts and
possibly incorrect auto-merges.
After resolving each of the conflicts, add your changes to the
branch, commit, and push your changes:
```
git add .github/dependabot.yml Dockerfile README.md 
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.
Wait for all the automated tests to pass.
Check the "Everything is cool" checkbox below:
- ✌️ The conflicts in this pull request have been resolved.
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

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] <[email protected]>

…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] <[email protected]>

…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.

…nores Update Dependabot ignore directives

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.

Update pre-commit hooks

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.

Add workflow to manage repository labels

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.

Update two configuration files

…skeleton

Co-authored-by: Shane Frasier <[email protected]>

The golang/lint tool was archived on May 9th, 2021 and based on golang/go#38968 no future work is planned. Coupled with the fact that it is not available from brew we are removing this hook as local development may be hindered by trying to satisfy running this hook. Co-authored-by: Shane Frasier <[email protected]> Co-authored-by: dav3r <[email protected]>

This is done automatically with the `pre-commit autoupdate` command.

Resolves cisagov/skeleton-generic#131.

The cache key used relies on the existence of a go.sum file. Since we have no expectation for Go source code, including that file, and since we already include the Go cache in our job caching, we can safely disable caching in the Action.

Bump the version of Go used in our GitHub Actions configuration to the latest stable Go release.

The version of Python used in the `lint` job of the build workflow for GitHub Actions was updated to 3.11 so we should update the `test` job to match.

The `setuptools` and `wheel` packages were added to the `lint` job in GitHub Actions and it should be duplicated for the `test` job.

Bumps python from 3.10.1-alpine to 3.11.4-alpine. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

# Conflicts: # Dockerfile

Lineage pull request for: skeleton

The pytest-dockerc plug is unmaintained and there is now a dependency issues with PyYAML because of the release of Cython v3 (which is itself a build dependency for PyYAML). After some research this seemed like the most similar package in terms of functionality to the package we are replacing. Although it is not a pytest plugin it still provides similar access and uses the Docker composition defined in the repository.

Switch packages used to test the configuration

# Conflicts: # tests/container_test.py

mcdonnnj and others added 30 commits May 27, 2022 18:04

Update actions/setup-go from v2 to v3

57b4abe

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.

Update the version of Go used from 1.16 to 1.18

8f68498

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.

Update the version of Go used from 1.18 to 1.19

fc55e84

Go 1.19 was released while this branch was in the wings and it makes sense to bump to the latest Go release.

Merge pull request #113 from cisagov/improvement/update_go_configuration

ec83308

Update Go installation in the `build.yml` workflow

Merge pull request #111 from cisagov/dependabot/github_actions/hashic…

4925eb1

…orp/setup-terraform-2 Bump hashicorp/setup-terraform from 1 to 2

Merge pull request #115 from cisagov/dependabot/github_actions/action…

f74b4a3

…s/setup-python-4 Bump actions/setup-python from 3 to 4

Add an ownership comment to the Dependabot configuration

6a9c630

Add a comment that states that the commented out ignore directives are managed by cisagov/skeleton-generic.

Add additional Dependabot ignore directives

dfd54e9

This adds the other versioned Actions that should be managed by cisagov/skeleton-generic to the list of commented out dependencies to ignore.

Merge pull request #112 from cisagov/improvement/update_dependabot_ig…

a8bcddd

…nores Update Dependabot ignore directives

Merge pull request #119 from cisagov/bug/update_github_actions_workflow

0867685

Remove usage of `set-output` from our GitHub Actions workflow

Enable the allow-non-breakable-inline-mappings rule for yamllint

21a68f4

Increase the maximum line length in the yamllint configuration

3547c4f

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.

Merge pull request #117 from cisagov/improvement/update_yamllint_line…

cfa9ba5

…-length_rules Update the `line-length` configuration for `yamllint`

Fix the repo of the flake8 pre-commit hook

b1ea3d4

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.

Merge pull request #120 from cisagov/bug/verify_pre-commit_hook_repos

2a98c6a

Update the `flake8` pre-commit hook configuration

Update pre-commit hooks

fb8d13f

Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook is intentionally held back due to issues with upgrading to v6.

Merge pull request #114 from cisagov/maintenance/update_pre-commit_hooks

bb9c2a0

Update pre-commit hooks

Add a label configuration file

e5fbd70

This configuration file stores information about the labels expected in this repository.

Add a workflow to synchronize repository labels

b9792a8

This adds a workflow to ensure that the repository labels are updated to reflect changes to the label configuration file .github/labels.yml.

Remove duplicate label

161c4ae

Add a label for issues or PRs that involve test code

5993231

Merge pull request #118 from cisagov/improvement/add_label_sync_workflow

c4fbf20

Add workflow to manage repository labels

Fix GitHub label color values

6cc53dc

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.

Correct spacing in yamllint rules

8f12635

There was a missing empty line in the `.yamllint` file between two rule definitions.

Merge pull request #122 from cisagov/bug/fix_bad_configurations

e803e1a

Update two configuration files

Merge remote-tracking branch 'skeleton-generic/develop' into lineage/…

bade9e2

…skeleton

Add repository specific label

663dd87

jasonodoom and others added 30 commits July 14, 2023 19:00

Add Staticcheck

ff0ebdf

Fix indentation

f953e8e

Co-authored-by: Shane Frasier <[email protected]>

Fix indentation

932b62e

Co-authored-by: Shane Frasier <[email protected]>

Fix indentation

2eca0cd

Co-authored-by: Shane Frasier <[email protected]>

Fix formatting

fab2344

Co-authored-by: Shane Frasier <[email protected]>

Fix formatting

892673b

Co-authored-by: Shane Frasier <[email protected]>

Fix formatting

0d77207

Co-authored-by: Shane Frasier <[email protected]>

Revert updated versions for existing hooks

b661316

Fix formatting

6a40279

Remove extra hook ids

b0f2bf3

Replace hooks with repo based option when available

a93f6d4

Update pre-commit hook versions

033e194

This is done automatically with the `pre-commit autoupdate` command.

Add apostrophe to Qapla

43a4bd1

detecting virtualenv installation successfully

7bfd06c

Whitespace change to make shfmt linter happy

6030c9a

Fix two broken links

2122a39

Resolves cisagov/skeleton-generic#131.

Disable caching for the setup-go Action

92e0e6a

The cache key used relies on the existence of a go.sum file. Since we have no expectation for Go source code, including that file, and since we already include the Go cache in our job caching, we can safely disable caching in the Action.

Bump Go from 1.19 to 1.20

2e746e2

Bump the version of Go used in our GitHub Actions configuration to the latest stable Go release.

Update the version of Python used in the GHA test job

c07be40

The version of Python used in the `lint` job of the build workflow for GitHub Actions was updated to 3.11 so we should update the `test` job to match.

Install two additional Python packages in the GHA test job

2a16326

The `setuptools` and `wheel` packages were added to the `lint` job in GitHub Actions and it should be duplicated for the `test` job.

Bump python from 3.10.1-alpine to 3.11.4-alpine

8237d27

Bumps python from 3.10.1-alpine to 3.11.4-alpine. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton

7aeeb5e

Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

0dcc61d

# Conflicts: # Dockerfile

Merge branch 'develop' into lineage/skeleton

cf24b08

Merge pull request #166 from cisagov/lineage/skeleton

8c26a61

Lineage pull request for: skeleton

Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

7a728d6

Merge pull request #167 from cisagov/improvement/update_testing_method

a9d6c92

Switch packages used to test the configuration

Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

fc93df4

# Conflicts: # tests/container_test.py

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Nov 22, 2022

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

Are you sure you want to change the base?

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

Conversation

cisagovbot commented Nov 22, 2022

Lineage Pull Request: CONFLICT

How to resolve the conflicts