merged manually
This commit is contained in:
16
.github/workflows/rust.yml
vendored
16
.github/workflows/rust.yml
vendored
@@ -34,31 +34,15 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v1
|
uses: actions/upload-artifact@v1
|
||||||
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
|
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
|
||||||
with:
|
with:
|
||||||
<<<<<<< HEAD
|
|
||||||
<<<<<<< HEAD
|
|
||||||
name: ${{ matrix.os }}-silentdragonlite-cli
|
name: ${{ matrix.os }}-silentdragonlite-cli
|
||||||
path: target/release/silentdragonlite-cli
|
path: target/release/silentdragonlite-cli
|
||||||
=======
|
|
||||||
name: ${{ matrix.os }}-silentdragonlite-cli
|
|
||||||
path: target/release/silentdragonlite-cli
|
|
||||||
=======
|
|
||||||
name: ${{ matrix.os }}-zecwallet-cli
|
|
||||||
path: target/release/zecwallet-cli
|
|
||||||
>>>>>>> 959755d705b18d13a8dbdf0502c47818fe7a4e94
|
|
||||||
- name: Upload windows
|
- name: Upload windows
|
||||||
uses: actions/upload-artifact@v1
|
uses: actions/upload-artifact@v1
|
||||||
if: contains(matrix.os, 'windows')
|
if: contains(matrix.os, 'windows')
|
||||||
with:
|
with:
|
||||||
<<<<<<< HEAD
|
|
||||||
name: ${{ matrix.os }}-silentdragonlite-cli.exe
|
name: ${{ matrix.os }}-silentdragonlite-cli.exe
|
||||||
path: target/release/silentdragonlite-cli.exe
|
path: target/release/silentdragonlite-cli.exe
|
||||||
|
|
||||||
>>>>>>> 959755d705b18d13a8dbdf0502c47818fe7a4e94
|
|
||||||
=======
|
|
||||||
name: ${{ matrix.os }}-zecwallet-cli.exe
|
|
||||||
path: target/release/zecwallet-cli.exe
|
|
||||||
|
|
||||||
>>>>>>> 959755d705b18d13a8dbdf0502c47818fe7a4e94
|
|
||||||
|
|
||||||
linux_arm7:
|
linux_arm7:
|
||||||
name: Linux ARMv7
|
name: Linux ARMv7
|
||||||
|
|||||||
Reference in New Issue
Block a user