Fix conflicts in PR 402 - Automated branch-sync #403
Merged
Conversation
This file contains hidden or 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
This reverts commit 87d4c03.
…n after 6x is executed
…nt-colour-indicator-for-all-backward-compatibility [SD-1147] Removed the colour indicator from bay.
SDPPE-123: Enable and align workflows for 7.x branch
SDPPE-124: Update branch-sync workflow resilient to cherry-pick conflicts
…-tables-to-nodata [SD-1322] Prevent scheduled_transition crashes caused by missing node…
* [SDPPE-169] Removed deprecated class from awx-ee * [SDPPE-169] Updated lagoon.api version constraint * [SDPPE-169] Cleanup whitespace
…nd aws-es-proxy integration (#373)
…efix [SD-1111] Update prefix for data pipelines
images/ci-builder/Dockerfile
Outdated
| FROM hashicorp/terraform:latest AS terraform | ||
| FROM ghcr.io/dpc-sdp/sumocli:v0.11.1 AS sumocli | ||
| FROM php:8.4-cli-alpine | ||
| FROM php:8.3-cli-alpine |
Contributor
There was a problem hiding this comment.
Reverted to php 8.3
nicksantamaria
approved these changes
Nov 25, 2025
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.
Motivation
Fix conflicts created as part of automated process
Changes