diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index be91087..6adcfb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,7 +77,7 @@ jobs: CARGO_BUILD_JOBS=2 cargo build --release --locked ./hook/build.sh ./capture/build.sh - ./packaging/build-arch-package.sh dist + ./packaging/build-arch-package.sh "$1/dist" ' _ "$GITHUB_WORKSPACE" - uses: actions/upload-artifact@v4 with: diff --git a/packaging/build-arch-package.sh b/packaging/build-arch-package.sh index 471ca0d..51d23bf 100755 --- a/packaging/build-arch-package.sh +++ b/packaging/build-arch-package.sh @@ -4,6 +4,9 @@ set -euo pipefail project_root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd -P) version=$(sed -n 's/^version = "\([^"]*\)"/\1/p' "$project_root/Cargo.toml" | head -n1) output=${1:-$project_root/dist} +mkdir -p "$output" +output=$(cd -- "$output" && pwd -P) +readonly output build_dir=$(mktemp -d "${TMPDIR:-/tmp}/uur-makepkg.XXXXXX") trap 'rm -rf -- "$build_dir"' EXIT @@ -12,7 +15,6 @@ command -v makepkg >/dev/null 2>&1 || { exit 2 } -mkdir -p "$output" sed -e "s|@UUR_VERSION@|$version|g" \ -e "s|@UUR_PROJECT_ROOT@|$project_root|g" \ "$project_root/packaging/arch/PKGBUILD.in" >"$build_dir/PKGBUILD"