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

cisagovbot · 2022-01-12T08:40:18Z

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/gophish-docker.git gophish-docker
cd gophish-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 Dockerfile 
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

This hook should now work as expected in most, if not all of our repos now that we are finally updating to terraform 0.13.x (on our way to 1.0.x).

…f_0.13 This change will be reverted when testing is completed.

Initialization will now be done during the "terraform validate" step.

…upport_tf_0.13" This reverts commit 6a7fbf0.

…date Enable terraform validate pre-commit hook

Bumps [actions/github-script](https://github.com/actions/github-script) from 4 to 5. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](actions/github-script@v4...v5) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Update code to reflect breaking changes in V5 of cisagov/github-script as mentioned here: https://github.com/actions/github-script#breaking-changes-in-v5

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

Update `pre-commit` Hooks

This file is copied from cisagov/skeleton-ansible-role#85 and tweaked to pass pre-commit. See here for for a list of the elements that can exist in this file: https://ansible-lint.readthedocs.io/en/latest/configuring.html Co-authored-by: Shane Frasier <[email protected]>

…re-commit_version Update the `ansible-lint` Version in the pre-commit Configuration

This will configure `dependabot` to scan Terraform configurations if they exist in a repository. If a repository stores a Terraform configuration in a sub- directory this configuration will need to be modified or an additional configuration must be added if there still exists a Terraform configuration in the root directory.

…uration_for_terraform Add `dependabot` Configuration for Terraform

Change from using an environment variable to the outputs of the cisagov/setup-env-github-action instead.

We use a `PACKER_VERSION` environment variable for the "Install Packer" step that is populated from the `setup-env` outputs to get around `yamllint` lint length limits.

We change the "Install shfmt" step to use two local environment variables to provide the package's URL and version to install. This allows us to work around `yamllint` line length limits.

We change the "Install Terraform-docs" step to use two local environment variables to provide the package's URL and version to install. This allows us to work around `yamllint` line length limits.

This changes from using an environment variable to using a step output to store the Go version that is installed. This mirrors changes made to the other program versions and how they're stored.

Use Outputs of cisagov/setup-env-github-action to Control Installed Program Versions

Remove the manual exclusion of the `converge.yml` file in the default molecule scenario. With the changes in cisagov/skeleton-ansible-role#88 this exclusion is no longer necessary.

Instead of excluding molecule configurations for systemd individually we instead direct ansible-lint to process any of these configurations in scenario directories as plain yaml files. This mirrors how ansible-lint handles `molecule.yml` files in scenario directories by default.

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

Update pre-commit hooks using `pre-commit autoupdate`.

Update `pre-commit` hooks

…tion

…onfiguration Update `ansible-lint` Configuration

Lineage pull request for: skeleton

…lpine Bump python from 3.10.0-alpine to 3.10.1-alpine

…script-5

…/github-script-5 Bump actions/github-script from 4 to 5

dav3r and others added 30 commits August 26, 2021 09:56

Enable terraform validate pre-commit hook

60b612d

This hook should now work as expected in most, if not all of our repos now that we are finally updating to terraform 0.13.x (on our way to 1.0.x).

Temporarily use cisagov/setup-env-github-action@improvement/support_t…

6a7fbf0

…f_0.13 This change will be reverted when testing is completed.

Remove lint job step to initialize Terraform directories

895a692

Initialization will now be done during the "terraform validate" step.

Revert "Temporarily use cisagov/setup-env-github-action@improvement/s…

b51dbb5

…upport_tf_0.13" This reverts commit 6a7fbf0.

Merge pull request #90 from cisagov/improvement/enable_terraform_vali…

1b5cd25

…date Enable terraform validate pre-commit hook

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

65b7140

Update for actions/github-script API changes

fc28df1

Update code to reflect breaking changes in V5 of cisagov/github-script as mentioned here: https://github.com/actions/github-script#breaking-changes-in-v5

Update pre-commit hooks

b66988d

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

Merge pull request #91 from cisagov/improvement/pre-commit_update

f3000e5

Update `pre-commit` Hooks

Update the ansible-lint version for pre-commit

b78b832

Merge pull request #93 from cisagov/improvement/update_ansible-lint_p…

14d2edb

…re-commit_version Update the `ansible-lint` Version in the pre-commit Configuration

Merge pull request #94 from cisagov/improvement/add_dependabot_config…

ff73498

…uration_for_terraform Add `dependabot` Configuration for Terraform

Use an id when using cisagov/setup-env-github-action

6cf78c0

Use setup-env outputs for Terraform version

1e16136

Change from using an environment variable to the outputs of the cisagov/setup-env-github-action instead.

Use setup-env outputs for Packer version

64b2471

We use a `PACKER_VERSION` environment variable for the "Install Packer" step that is populated from the `setup-env` outputs to get around `yamllint` lint length limits.

Use setup-env outputs for shfmt version

0851598

We change the "Install shfmt" step to use two local environment variables to provide the package's URL and version to install. This allows us to work around `yamllint` line length limits.

Use setup-env outputs for Terraform-docs version

2699e09

We change the "Install Terraform-docs" step to use two local environment variables to provide the package's URL and version to install. This allows us to work around `yamllint` line length limits.

Store Go version as a step output

8797e11

This changes from using an environment variable to using a step output to store the Go version that is installed. This mirrors changes made to the other program versions and how they're stored.

Merge pull request #92 from cisagov/improvement/use_action_outputs

ee39ac5

Use Outputs of cisagov/setup-env-github-action to Control Installed Program Versions

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

1bdcd86

Update ansible-lint configuration

6a10135

Remove the manual exclusion of the `converge.yml` file in the default molecule scenario. With the changes in cisagov/skeleton-ansible-role#88 this exclusion is no longer necessary.

Bump python from 3.10.0-alpine to 3.10.1-alpine

18c9920

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

Update pre-commit hooks

3f370eb

Update pre-commit hooks using `pre-commit autoupdate`.

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

115af25

Update `pre-commit` hooks

Merge branch 'develop' into improvement/update_ansible-lint_configura…

6e652ec

…tion

Merge pull request #95 from cisagov/improvement/update_ansible-lint_c…

11eca90

…onfiguration Update `ansible-lint` Configuration

mcdonnnj and others added 7 commits January 11, 2022 19:31

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

f0e6779

Merge branch 'develop' into lineage/skeleton

2c1342d

Merge pull request #72 from cisagov/lineage/skeleton

fb31336

Lineage pull request for: skeleton

Merge branch 'develop' into dependabot/docker/python-3.10.1-alpine

54fa1dc

Merge pull request #75 from cisagov/dependabot/docker/python-3.10.1-a…

862c50f

…lpine Bump python from 3.10.0-alpine to 3.10.1-alpine

Merge branch 'develop' into dependabot/github_actions/actions/github-…

8782721

…script-5

Merge pull request #73 from cisagov/dependabot/github_actions/actions…

4673247

…/github-script-5 Bump actions/github-script from 4 to 5

cisagovbot assigned dav3r, felddy, jsf9k and mcdonnnj Jan 12, 2022

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Jan 12, 2022

dav3r assigned dav3r and unassigned felddy, jsf9k, dav3r and mcdonnnj Jan 12, 2022

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

ef41177

dav3r force-pushed the lineage/skeleton branch from 59702e1 to ef41177 Compare January 12, 2022 21:23

dav3r marked this pull request as ready for review January 12, 2022 21:39

dav3r requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners January 12, 2022 21:39

dav3r approved these changes Jan 12, 2022

View reviewed changes

jsf9k approved these changes Jan 13, 2022

View reviewed changes

mcdonnnj approved these changes Jan 13, 2022

View reviewed changes

dav3r merged commit 7a4ec57 into develop Jan 13, 2022

dav3r deleted the lineage/skeleton branch January 13, 2022 21:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jan 12, 2022 •

edited by dav3r

Loading

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

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

Conversation

cisagovbot commented Jan 12, 2022 • edited by dav3r Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

cisagovbot commented Jan 12, 2022 •

edited by dav3r

Loading