diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76f74a0..d39dc18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -205,7 +205,8 @@ jobs: if: matrix.package_type == 'snap' run: | cargo build --release - mkdir -p dist && cp target/release/dcr dist/ + mkdir -p packaging/snap/dist + cp target/release/dcr packaging/snap/dist/ - name: Snapcraft Build Action if: matrix.package_type == 'snap' @@ -371,7 +372,8 @@ jobs: with: usesh: true run: | - pkg install -y rust perl gmake + export PATH="/usr/local/bin:/usr/local/sbin:$PATH" + pkg install -y rust perl5 gmake cargo build --release - name: Prepare FreeBSD Artifact @@ -388,6 +390,7 @@ jobs: with: usesh: true run: | + export PATH="/usr/local/bin:$PATH" pkg_add rust perl gmake cargo build --release @@ -405,6 +408,7 @@ jobs: with: usesh: true run: | + export PATH="/usr/pkg/bin:/usr/pkg/sbin:$PATH" pkgin -y install rust perl gmake cargo build --release diff --git a/Cargo.toml b/Cargo.toml index c175a07..451e9d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,8 +29,9 @@ description = """ Cargo-like utility to manage C/C++ projects. """ -[package.metadata.generate-rpm.files] -"/usr/bin/dcr" = { source = "target/release/dcr", mode = "755" } +assets = [ + { source = "target/release/dcr", dest = "/usr/bin/dcr", mode = "755" } +] [dependencies] glob = "0.3" diff --git a/packaging/snap/snapcraft.yaml b/packaging/snap/snapcraft.yaml index 5ea941a..9d29037 100644 --- a/packaging/snap/snapcraft.yaml +++ b/packaging/snap/snapcraft.yaml @@ -15,4 +15,4 @@ apps: parts: dcr: plugin: dump - source: ../../dist/ \ No newline at end of file + source: dist/ \ No newline at end of file