diff --git a/.github/workflows/build-windows-msbuild.yml b/.github/workflows/build-windows-msbuild.yml index 9fb3ac7e5..3db5d1d6e 100644 --- a/.github/workflows/build-windows-msbuild.yml +++ b/.github/workflows/build-windows-msbuild.yml @@ -25,7 +25,7 @@ jobs: - name: build ${{ inputs.workflow }}-windows-${{ inputs.toolset }} run: | - .tools\busybox64.exe sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh + .tools\busybox.exe sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 4e1a320e4..df36ff1b9 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - name: build ${{ inputs.workflow }}-windows-${{ inputs.toolset }} run: | - .tools\busybox64.exe sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh + .tools\busybox.exe sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/test-nanoserver.yml b/.github/workflows/test-nanoserver.yml index d3d978bbf..8ad6a5016 100644 --- a/.github/workflows/test-nanoserver.yml +++ b/.github/workflows/test-nanoserver.yml @@ -29,5 +29,5 @@ jobs: - name: Test ${{ inputs.artifact }} build on nanoserver-ltsc2022 run: | tar -xf ./${{ inputs.artifact }}.tar.gz -C ./bin - docker container run --rm -v ${{ github.workspace }}:C:\app -w C:\app\${{ inputs.workflow }} ${{ env.IMAGE_NAME }} C:\app\.tools\busybox64.exe bash test_windows.sh + docker container run --rm -v ${{ github.workspace }}:C:\app -w C:\app\${{ inputs.workflow }} ${{ env.IMAGE_NAME }} C:\app\.tools\busybox.exe bash test_windows.sh diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 86fd259e3..706df213f 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -22,7 +22,7 @@ jobs: run: | tar -xf ./${{ inputs.artifact }}.tar.gz -C ./bin cd ./${{ inputs.workflow }} - ../.tools/busybox64.exe bash ./test_windows.sh + ../.tools/busybox.exe bash ./test_windows.sh - uses: actions/upload-artifact@v3 with: diff --git a/.tools/busybox.exe b/.tools/busybox.exe new file mode 100644 index 000000000..eb494195f Binary files /dev/null and b/.tools/busybox.exe differ diff --git a/.tools/busybox64.exe b/.tools/busybox64.exe deleted file mode 100644 index 537b7f948..000000000 Binary files a/.tools/busybox64.exe and /dev/null differ