This commit is contained in:
Mateusz Faderewski 2024-06-27 21:56:40 +02:00
parent 725ac386e5
commit de12251d25
3 changed files with 31 additions and 22 deletions

View File

@ -52,27 +52,26 @@ jobs:
build-deployer: build-deployer:
strategy: strategy:
matrix: matrix:
# version: [windows, windows-32bit, linux, macos] version: [windows, windows-32bit, linux, macos]
version: [linux, macos]
include: include:
# - version: windows - version: windows
# os: windows-latest os: windows-latest
# executable: target/release/sc64deployer.exe executable: target/release/sc64deployer.exe
# package-name: sc64-deployer-windows package-name: sc64-deployer-windows
# package-params: -c -a -f package-params: -c -a -f
# package-extension: zip package-extension: zip
# - version: windows-32bit - version: windows-32bit
# os: windows-latest os: windows-latest
# build-params: --target=i686-pc-windows-msvc build-params: --target=i686-pc-windows-msvc
# executable: target/i686-pc-windows-msvc/release/sc64deployer.exe executable: target/i686-pc-windows-msvc/release/sc64deployer.exe
# package-name: sc64-deployer-windows-32bit package-name: sc64-deployer-windows-32bit
# package-params: -c -a -f package-params: -c -a -f
# package-extension: zip package-extension: zip
- version: linux - version: linux
os: ubuntu-latest os: ubuntu-latest
apt-packages: libftdi1-dev libudev-dev apt-packages: libudev-dev
executable: target/release/sc64deployer executable: target/release/sc64deployer
package-name: sc64-deployer-linux package-name: sc64-deployer-linux
package-params: -czf package-params: -czf
@ -80,7 +79,6 @@ jobs:
- version: macos - version: macos
os: macos-latest os: macos-latest
brew-packages: libftdi
executable: target/release/sc64deployer executable: target/release/sc64deployer
package-name: sc64-deployer-macos package-name: sc64-deployer-macos
package-params: -czf package-params: -czf
@ -106,10 +104,6 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get -y install ${{ matrix.apt-packages }} sudo apt-get -y install ${{ matrix.apt-packages }}
- name: Install brew packages
if: matrix.brew-packages
run: brew install ${{ matrix.brew-packages }}
- name: Build deployer - name: Build deployer
run: cargo b -r ${{ matrix.build-params }} run: cargo b -r ${{ matrix.build-params }}
working-directory: sw/deployer working-directory: sw/deployer

14
sw/deployer/Cargo.lock generated
View File

@ -739,6 +739,7 @@ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"libftdi1-source-lgpl", "libftdi1-source-lgpl",
"libusb1-sys",
"pkg-config", "pkg-config",
"vcpkg", "vcpkg",
] ]
@ -774,6 +775,18 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "libusb1-sys"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f6bace2f39082e9787c851afce469e7b2fe0f1cc64bbc68ca96653b63d8f17"
dependencies = [
"cc",
"libc",
"pkg-config",
"vcpkg",
]
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.12" version = "0.4.12"
@ -1221,6 +1234,7 @@ dependencies = [
"image", "image",
"include-flate", "include-flate",
"libftdi1-sys", "libftdi1-sys",
"libusb1-sys",
"md5", "md5",
"panic-message", "panic-message",
"rand", "rand",

View File

@ -17,7 +17,8 @@ encoding_rs = "0.8.34"
hex = "0.4.3" hex = "0.4.3"
image = "0.25.1" image = "0.25.1"
include-flate = { version = "0.2.0", features = ["stable"] } include-flate = { version = "0.2.0", features = ["stable"] }
libftdi1-sys = { version = "1.1.3", features = ["vendored"] } libftdi1-sys = { version = "1.1.3", features = ["libusb1-sys", "vendored"] }
libusb1-sys = { version = "0.6.5", features = ["vendored"] }
md5 = "0.7.0" md5 = "0.7.0"
panic-message = "0.3.0" panic-message = "0.3.0"
rand = "0.8.5" rand = "0.8.5"