Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,20 @@ jobs:
# Try a basic curl to see if service responds
curl -v --connect-timeout 5 "http://localhost:${{ steps.test-vars.outputs.port }}/" || true

- name: Patch Adobe CF serialfilter.txt for Oracle JDBC
if: ${{ (matrix.cfengine == 'adobe2023' || matrix.cfengine == 'adobe2025') && matrix.dbengine == 'oracle' }}
run: |
docker exec wheels-${{ matrix.cfengine }}-1 sh -c "echo ';oracle.sql.converter.**;oracle.sql.**;oracle.jdbc.**' >> /wheels-test-suite/.engine/${{ matrix.cfengine }}/WEB-INF/cfusion/lib/serialfilter.txt"

- name: Restart CF Engine
if: ${{ (matrix.cfengine == 'adobe2023' || matrix.cfengine == 'adobe2025') && matrix.dbengine == 'oracle' }}
run: |
docker restart wheels-${{ matrix.cfengine }}-1

- name: Wait for Oracle to be ready
if: ${{ matrix.dbengine == 'oracle' }}
run: sleep 120

- name: Running onServerInstall Script for Adobe2021, Adobe2023, and Adobe2025
if: ${{ matrix.cfengine == 'adobe2021' || matrix.cfengine == 'adobe2023' || matrix.cfengine == 'adobe2025' }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions cli/src/commands/wheels/config/diff.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ component extends="commandbox.modules.wheels-cli.commands.wheels.base" {
// Display environment variable differences
if (arguments.compareEnv && StructKeyExists(arguments.differences, "env")) {
if (arguments.compareSettings && StructKeyExists(arguments.differences, "settings")) {
detailOutput.separator();
detailOutput.line();
}
detailOutput.subHeader("ENVIRONMENT VARIABLES", 50);
displayDifferenceSection(arguments.differences.env, arguments.env1, arguments.env2, arguments.changesOnly, "env");
Expand Down Expand Up @@ -307,7 +307,7 @@ component extends="commandbox.modules.wheels-cli.commands.wheels.base" {
// Overall summary
local.grandTotal = local.totalIdentical + local.totalDifferent + local.totalUnique;
if (local.grandTotal > 0) {
detailOutput.separator();
detailOutput.line();
detailOutput.output("Overall:");
detailOutput.metric("Total configurations", local.grandTotal);
detailOutput.metric("Identical", local.totalIdentical);
Expand Down
2 changes: 1 addition & 1 deletion cli/src/commands/wheels/dbmigrate/latest.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ component aliases='wheels db latest,wheels db migrate' extends="../base" {
}

// Add a separator before the info command output
detailOutput.separator();
detailOutput.line();
command('wheels dbmigrate info').run();
}

Expand Down
2 changes: 1 addition & 1 deletion cli/src/commands/wheels/dbmigrate/up.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ component aliases='wheels db up' extends="../base" {
} else {
detailOutput.statusWarning("No more versions to go to?");
}
detailOutput.separator();
detailOutput.line();
command('wheels dbmigrate info').run();
}

Expand Down
Loading
Loading