misc: move make_dist.py users to make-dist

This commit is contained in:
Allison Karlitskaya 2022-03-09 15:48:16 +01:00 committed by Martin Pitt
parent 7de2103f0a
commit e2ffd77fbc
4 changed files with 5 additions and 7 deletions

View File

@ -75,9 +75,9 @@ jobs:
- name: Download dists tarball for current git SHA from GitHub
id: make_dist
run: ./test/make_dist.py --wait
run: tools/make-dist --wait
- name: Write a comment on the PR prompting the user to try later if make_dist.py failed
- name: Write a comment on the PR prompting the user to try later if make-dist failed
uses: actions/github-script@v3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -3,12 +3,10 @@ actions:
# packit will overwrite the version in its "fix spec file" stage
- tools/create-spec --version 0 --build-all -o cockpit.spec tools/cockpit.spec.in
create-archive:
- ./autogen.sh mock
# The sandcastle doesn't have enough ram to run webpack, so wait
# until the webpack-jumpstart workflow has run and grab the result.
- tools/webpack-jumpstart --wait --rebase
- make XZ_OPT=-0 dist
- sh -c 'echo cockpit-*.tar.xz'
- tools/make-dist
srpm_build_deps:
- automake
- gcc

View File

@ -50,7 +50,7 @@ if [ $# -gt 1 ]; then
fi
if [ -z "${1:-}" ]; then
source=$("$mydir/../test/make_dist.py" | tail -n1)
source="$("$mydir/../tools/make-dist")"
else
source="$(realpath "$1")"
fi

View File

@ -56,7 +56,7 @@ if [ $# -gt 1 ]; then
fi
if [ -z "${1-}" ]; then
source=$("$base/test/make_dist.py" | tail -n1)
source="$("$base/tools/make-dist")"
else
source="$1"
fi