LailaTheElf/actions-rust-cross
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always pass "+toolchain" to cargo or cross

Browse Source 
I don't think this was actually using the specified toolchain, at least not
when cross compiling.
This commit is contained in:
Dave Rolsky 2023-04-21 23:01:24 -05:00
parent 356ca41f7d
commit d788e00f15
No known key found for this signature in database
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Changes.md
View File

@ -1,3 +1,10 @@
## 0.0.7 - 2023-04-21
- The toolchain argument was (probably) not being respected with cross builds,
though it's hard to be sure since none of the output from past CI runs I've
looked at it includes the toolchain version in the output. But now the
toolchain version is explicitly passed to all `cargo` and `cross` commands.
## 0.0.6 - 2023-04-21 ## 0.0.6 - 2023-04-21
- When the `strip` parameter was true, stripping binaries could fail if there - When the `strip` parameter was true, stripping binaries could fail if there

9
action.yml
View File

@ -44,7 +44,6 @@ runs:
with: with:
targets: ${{ inputs.target }} targets: ${{ inputs.target }}
toolchain: ${{ inputs.toolchain }} toolchain: ${{ inputs.toolchain }}
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'false' }}
- name: Install cross if cross-compiling (*nix) - name: Install cross if cross-compiling (*nix)
shell: bash shell: bash
run: install-cross-nix.sh run: install-cross-nix.sh
@ -64,7 +63,7 @@ runs:
- name: Run tests (*nix) - name: Run tests (*nix)
shell: bash shell: bash
run: | run: |
${{ steps.set-build-command.outputs.build-command }} test ${{ inputs.args }} --target ${{ inputs.target }} ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} test ${{ inputs.args }} --target ${{ inputs.target }}
if: ${{ inputs.command != 'build' && runner.os != 'Windows' }} if: ${{ inputs.command != 'build' && runner.os != 'Windows' }}
# We want to run in Powershell on Windows to make sure we compile in a # We want to run in Powershell on Windows to make sure we compile in a
# native Windows environment. Some things won't compile properly under # native Windows environment. Some things won't compile properly under
@ -73,17 +72,17 @@ runs:
- name: Run tests (Windows) - name: Run tests (Windows)
shell: powershell shell: powershell
run: | run: |
& ${{ steps.set-build-command.outputs.build-command }} test ${{ inputs.args }} --target ${{ inputs.target }} & ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} test ${{ inputs.args }} --target ${{ inputs.target }}
if: ${{ inputs.command != 'build' && runner.os == 'Windows' }} if: ${{ inputs.command != 'build' && runner.os == 'Windows' }}
- name: Build binary (*nix) - name: Build binary (*nix)
shell: bash shell: bash
run: | run: |
${{ steps.set-build-command.outputs.build-command }} build ${{ inputs.args }} --target ${{ inputs.target }} ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} build ${{ inputs.args }} --target ${{ inputs.target }}
if: ${{ inputs.command != 'test' && runner.os != 'Windows' }} if: ${{ inputs.command != 'test' && runner.os != 'Windows' }}
- name: Build binary (Windows) - name: Build binary (Windows)
shell: powershell shell: powershell
run: | run: |
& ${{ steps.set-build-command.outputs.build-command }} build ${{ inputs.args }} --target ${{ inputs.target }} & ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} build ${{ inputs.args }} --target ${{ inputs.target }}
if: ${{ inputs.command != 'test' && runner.os == 'Windows' }} if: ${{ inputs.command != 'test' && runner.os == 'Windows' }}
- name: Strip binary - name: Strip binary
shell: bash shell: bash