diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf81893..25ef135 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -114,12 +114,17 @@ jobs: config="$4" target="build/packages/hubproxy-linux-${hubproxy_arch}.${packager}" temp_dir="build/packages/${hubproxy_arch}-${packager}" + binary="./build/hubproxy/hubproxy-linux-${hubproxy_arch}" rm -rf "${temp_dir}" mkdir -p "${temp_dir}" - HUBPROXY_ARCH="${hubproxy_arch}" NFPM_ARCH="${nfpm_arch}" NFPM_VERSION="${NFPM_VERSION}" nfpm package --config "${config}" --packager "${packager}" --target "${temp_dir}/" + rm -rf build/package-root + mkdir -p build/package-root + cp "${binary}" build/package-root/hubproxy + NFPM_ARCH="${nfpm_arch}" NFPM_VERSION="${NFPM_VERSION}" nfpm package --config "${config}" --packager "${packager}" --target "${temp_dir}/" mv "${temp_dir}"/*.${packager} "${target}" rm -rf "${temp_dir}" + rm -rf build/package-root } # AMD64 包 diff --git a/packaging/nfpm.apk.yaml b/packaging/nfpm.apk.yaml index a9c8925..73242cb 100644 --- a/packaging/nfpm.apk.yaml +++ b/packaging/nfpm.apk.yaml @@ -14,7 +14,7 @@ depends: - logrotate contents: - - src: ./build/hubproxy/hubproxy-linux-${HUBPROXY_ARCH} + - src: ./build/package-root/hubproxy dst: /usr/bin/hubproxy file_info: mode: 0755 diff --git a/packaging/nfpm.deb-rpm.yaml b/packaging/nfpm.deb-rpm.yaml index 8f76e6b..5970631 100644 --- a/packaging/nfpm.deb-rpm.yaml +++ b/packaging/nfpm.deb-rpm.yaml @@ -12,7 +12,7 @@ homepage: https://github.com/sky22333/hubproxy license: MIT contents: - - src: ./build/hubproxy/hubproxy-linux-${HUBPROXY_ARCH} + - src: ./build/package-root/hubproxy dst: /usr/bin/hubproxy file_info: mode: 0755