Merge Test Branch jcw/upgrade_to_18 into Feature Branch feature/upgrade_to_18_v2 for Integration Validation #28
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JaimieWi
added a commit
that referenced
this pull request
Oct 1, 2024
…on (#27) * new branch - updates * upgrade pip to avoid dependency issues * v0.17.0 to v0.17.1- see main repo for details * see v0.17.2 updates * v19 api_app req.txt * see tag 17.4 - update vmss req.txt * new test - open_telemetry dependancy * fix to base workspace * terraform lock update * update hash terraform lock * core terraform lock updates * fix test * update fix * Merge Test Branch jcw/upgrade_to_18 into Feature Branch feature/upgrade_to_18_v2 for Integration Validation (#28) * feature branch for merge TRE * user resource updates and v18 updates * lint fixes * version fix * update api and vmms req.txt * fix to base workspace * fix * terraform lock update * bring in ws updates * manual update to guacamole * upgrade our user resources * update to linux locals - fix apt_sku issue * small edit * apt_sku fix * fix * test update to linux UI install * test source linux build * remove custom image and use default MS linux image * Test message to users * revert * revert * disable colord * test image updates * small fix * test no screensaver * remove libre office * remove vscode reinstall * fix * revert porter to match main * lint --------- Co-authored-by: Jaimie Withers <jaimie.withers@bdi.ox.ac.uk> * fix windows and porter versions * update vscode * updates * fix * testing * revert * test moving code setup * fix --------- Co-authored-by: Jaimie Withers <jaimie.withers@bdi.ox.ac.uk>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
This pull request merges the changes from
jcw/upgrade_to_18into thefeature/upgrade_to_18_v2branch. The goal is to test the integration of the feature updates in a staging environment before merging into themain(production) branch.By merging into the test branch (
feature/upgrade_to_18_v2), we can:jcw/upgrade_to_18are compatible with the current state of the production code (represented by thefeature/upgrade_to_18_v2branch).Changes Included
The key changes from
jcw/upgrade_to_18include:Process Overview
jcw/upgrade_to_18intofeature/upgrade_to_18_v2to align the staging branch with the latest feature changes.feature/upgrade_to_18_v2will be merged intomainfor production deployment.Considerations
Action Required
Please review the changes, monitor the CI/CD results, and ensure all tests pass. This is a crucial step before merging the tested changes into
mainand deploying them to production.