Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

busybox.exe 1.37.0-FRP-5398 #113

Merged
merged 1 commit into from
Jun 27, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-windows-msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-nanoserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Binary file added .tools/busybox.exe
Binary file not shown.
Binary file removed .tools/busybox64.exe
Binary file not shown.
Loading