Skip to content

Conversation

@anmenaga
Copy link

PR Summary

These are not used anymore and are causing alerts (e.g. for Ubuntu 16), so removing them.

PR Checklist

@anmenaga anmenaga added CL-CodeCleanup Indicates that a PR should be marked as a Code Cleanup change in the Change Log CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log labels Oct 11, 2021
@anmenaga anmenaga requested a review from TravisEz13 October 11, 2021 20:15
@ghost ghost assigned iSazonov Oct 11, 2021
@iSazonov iSazonov added CL-Test Indicates that a PR should be marked as a test change in the Change Log and removed CL-CodeCleanup Indicates that a PR should be marked as a Code Cleanup change in the Change Log CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log labels Oct 13, 2021
@ghost
Copy link

ghost commented Oct 21, 2021

🎉v7.2.0-rc.1 has been released which incorporates this pull request.:tada:

Handy links:

@ghost
Copy link

ghost commented Dec 16, 2021

🎉v7.3.0-preview.1 has been released which incorporates this pull request.:tada:

Handy links:

TrapGodBrim pushed a commit to TrapGodBrim/PowerShell that referenced this pull request Jan 19, 2022
@TravisEz13
Copy link
Member

/backport to release/v7.0.11

@github-actions
Copy link
Contributor

github-actions bot commented Apr 29, 2022

Started backporting to release/v7.0.11: https://github.com/PowerShell/PowerShell/actions/runs/2242762082

GitHub
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

@github-actions
Copy link
Contributor

@TravisEz13 backporting to release/v7.0.11 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Removed old not-used-anymore docker-based tests for PS release packages
Using index info to reconstruct a base tree...
M	docker/tests/containerTestCommon.psm1
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docker/tests/containerTestCommon.psm1 deleted in Removed old not-used-anymore docker-based tests for PS release packages and modified in HEAD. Version HEAD of docker/tests/containerTestCommon.psm1 left in tree.
Removing docker/tests/Templates/ubuntu18.04/Dockerfile
Removing docker/tests/Templates/ubuntu16.04/Dockerfile
Removing docker/tests/Templates/opensuse42.3/Dockerfile
Removing docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
Removing docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
Removing docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile
Removing docker/tests/Templates/fxdependent-fedora28/Dockerfile
Removing docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile
Removing docker/tests/Templates/fxdependent-debian.9/Dockerfile
Removing docker/tests/Templates/fxdependent-centos7/Dockerfile
Removing docker/tests/Templates/fedora28/Dockerfile
Removing docker/tests/Templates/debian.9/Dockerfile
Removing docker/tests/Templates/centos7/Dockerfile
Removing docker/tests/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Removed old not-used-anymore docker-based tests for PS release packages
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

TravisEz13 pushed a commit that referenced this pull request May 4, 2022
…es (#16224)

# Conflicts:
#	docker/tests/containerTestCommon.psm1
@ghost
Copy link

ghost commented May 17, 2022

🎉v7.0.11 has been released which incorporates this pull request.:tada:

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backport-7.0.x-Done Backport-7.2.x-Done CL-Test Indicates that a PR should be marked as a test change in the Change Log

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants