Skip to content

Commit 04c7d92

Browse files
committed
debug output for Windows dockcross builds; fixing string concatenation bugs in CI
1 parent 6f7aeee commit 04c7d92

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/scripts/run-container-test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ def create_docker_image(opts, oci_exe, base_image_name, packages):
9999
cmd = [
100100
"RUN yum -y install",
101101
*packages,
102-
].join(" ")
103-
lines.append(cmd)
102+
]
103+
lines.append(' '.join(cmd))
104104

105105
# Compile the contents
106-
content = lines.join('\n')
106+
content = '\n'.join(lines) + '\n'
107107

108108
# Write the Dockerfile
109109
with open("Dockerfile", "w") as f:

.github/workflows/ci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,12 @@ jobs:
139139
- name: Setup build environment
140140
uses: ./.github/actions/setup-build
141141
- name: Configure Docker Images
142+
shell: powershell
142143
run: |
144+
echo "Building Docker images"
143145
./docker-images/build-all.sh
146+
echo "Built images:"
147+
ls -alsh dockcross-*
144148
- name: Build and Test ${{ env.PACKAGE_NAME }}
145149
run: |
146150
./gradlew build

0 commit comments

Comments
 (0)