Fix multiple commands

lukebemishprojects · Jul 15, 2024 · 6b03219 · 6b03219
1 parent 1a71e99
commit 6b03219
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_pr.yml b/.github/workflows/build_pr.yml
@@ -89,7 +89,7 @@
                 },
                 {
                     "name": "Run with Docker",
-                    "run": "docker run --workdir \"${GITHUB_WORKSPACE}\" -v \"${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}:z\" --rm --platform linux/${{ matrix.docker_arch }} -t ${{ matrix.docker }} \"mkdir ../working && cp -r ./ ../working/ && cd ../working && java @args-${{ matrix.os }}.txt && cp -r ./ ${GITHUB_WORKSPACE}/ && cd ${GITHUB_WORKSPACE}\"",
+                    "run": "docker run --workdir \"${GITHUB_WORKSPACE}\" -v \"${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}:z\" --rm --platform linux/${{ matrix.docker_arch }} -t ${{ matrix.docker }} /bin/bash -c \"mkdir ../working; cp -r ./ ../working/; cd ../working; java @args-${{ matrix.os }}.txt; cp -r ./ ${GITHUB_WORKSPACE}/; cd ${GITHUB_WORKSPACE}\"",
                     "if": "${{ matrix.docker }}"
                 },
                 {

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -89,7 +89,7 @@
                 },
                 {
                     "name": "Run with Docker",
-                    "run": "docker run --workdir \"${GITHUB_WORKSPACE}\" -v \"${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}:z\" --rm --platform linux/${{ matrix.docker_arch }} -t ${{ matrix.docker }} \"mkdir ../working && cp -r ./ ../working/ && cd ../working && java @args-${{ matrix.os }}.txt && cp -r ./ ${GITHUB_WORKSPACE}/ && cd ${GITHUB_WORKSPACE}\"",
+                    "run": "docker run --workdir \"${GITHUB_WORKSPACE}\" -v \"${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}:z\" --rm --platform linux/${{ matrix.docker_arch }} -t ${{ matrix.docker }} /bin/bash -c \"mkdir ../working; cp -r ./ ../working/; cd ../working; java @args-${{ matrix.os }}.txt; cp -r ./ ${GITHUB_WORKSPACE}/; cd ${GITHUB_WORKSPACE}\"",
                     "if": "${{ matrix.docker }}"
                 },
                 {

diff --git a/build.gradle b/build.gradle
@@ -118,10 +118,10 @@ managedVersioning {
                 step {
                     name.set 'Run with Docker'
                     parameters.put('if', '${{ matrix.docker }}')
-                    run.set 'docker run --workdir "${GITHUB_WORKSPACE}" -v "${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}:z" --rm --platform linux/${{ matrix.docker_arch }} -t ${{ matrix.docker }} "' +
-                            'mkdir ../working && cp -r ./ ../working/ && cd ../working && ' +
-                            'java @args-${{ matrix.os }}.txt && ' +
-                            'cp -r ./ ${GITHUB_WORKSPACE}/ && cd ${GITHUB_WORKSPACE}"'
+                    run.set 'docker run --workdir "${GITHUB_WORKSPACE}" -v "${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}:z" --rm --platform linux/${{ matrix.docker_arch }} -t ${{ matrix.docker }} /bin/bash -c "' +
+                            'mkdir ../working; cp -r ./ ../working/; cd ../working; ' +
+                            'java @args-${{ matrix.os }}.txt; ' +
+                            'cp -r ./ ${GITHUB_WORKSPACE}/; cd ${GITHUB_WORKSPACE}"'
                 }
                 step {
                     name.set 'Run'