mirror
/
inkstitch
kopia lustrzana https://github.com/inkstitch/inkstitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

moved mkdir artifacts to build-python (#3667) 

check to build artifacts folder for signed or local build

Co-authored-by: rejbasket <rejbasket@users.noreply.github.com>
pull/3668/head dev-build-claudine-remove_unuseful_trims_in_fonts
rejbasket 2025-04-13 21:53:06 +02:00 zatwierdzone przez GitHub
rodzic 6681593cb2
commit 91ffe0ceca
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
3 zmienionych plików z 18 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
bin/build-distribution-archives
Wyświetl plik

@ -1,7 +1,6 @@
VERSION="${VERSION:-$(echo ${GITHUB_REF} | sed -e 's|refs/heads/||' -e 's|refs/tags/||' -e 's|/|-|g')}" VERSION="${VERSION:-$(echo ${GITHUB_REF} | sed -e 's|refs/heads/||' -e 's|refs/tags/||' -e 's|/|-|g')}"
OS="${BUILD:-$(uname)}" OS="${BUILD:-$(uname)}"
ARCH="$(uname -m)" ARCH="$(uname -m)"
mkdir artifacts
if [ "$BUILD" = "osx" ]; then if [ "$BUILD" = "osx" ]; then
cp -a addons icons locales print LICENSE VERSION palettes symbols fonts tiles dbus inx dist/inkstitch.app/Contents/Resources cp -a addons icons locales print LICENSE VERSION palettes symbols fonts tiles dbus inx dist/inkstitch.app/Contents/Resources
@ -104,7 +103,7 @@ if [ "$BUILD" = "windows" ]; then
fi fi
fi fi
if [ "$BUILD" = "linux" ] || [ "$BUILD" = "linux-new" ] || [ "$BUILD" = "linux-old" ] || [ "$BUILD" = "linux32" ]; then if [ "$BUILD" = "linux" ] || [ "$BUILD" = "linux32" ]; then
if [[ "$VERSION" =~ ^v[0-9][.0-9]+$ ]]; then if [[ "$VERSION" =~ ^v[0-9][.0-9]+$ ]]; then
VERSION=${VERSION#v} VERSION=${VERSION#v}
else else

1
bin/build-python
Wyświetl plik

@ -63,3 +63,4 @@ shopt -s dotglob
mkdir dist/bin mkdir dist/bin
mv dist/inkstitch/* dist/bin mv dist/inkstitch/* dist/bin
mv dist/bin dist/inkstitch mv dist/bin dist/inkstitch
mkdir artifacts

29
bin/build-windows-installer
Wyświetl plik

@ -2,6 +2,20 @@
VERSION="${VERSION:-$(echo ${GITHUB_REF} | sed -e 's|refs/heads/||' -e 's|refs/tags/||' -e 's|/|-|g')}" VERSION="${VERSION:-$(echo ${GITHUB_REF} | sed -e 's|refs/heads/||' -e 's|refs/tags/||' -e 's|/|-|g')}"
OS="${BUILD:-$(uname)}" OS="${BUILD:-$(uname)}"
ARCH=$(python -c "import platform; n = platform.architecture()[0]; print(n)") ARCH=$(python -c "import platform; n = platform.architecture()[0]; print(n)")
# Check for signed directory
if [[ -d "signed-artifacts" ]]; then
DIRECTORY="signed-artifacts"
echo "Found signed artifacts"
else
if [[ ! -d "signed-artifacts" ]] && [[ ! -z "${GITHUB_REF}" ]]; then
mkdir signed-artifacts
DIRECTORY="signed-artifacts"
echo "Created signed artifacts"
else
DIRECTORY="artifacts"
echo "No signed artifacts found, local build"
fi
fi
# Create windows installer # Create windows installer
mkdir win mkdir win
cp installer_scripts/template.iss win/win_build.iss cp installer_scripts/template.iss win/win_build.iss
@ -14,21 +28,10 @@ sed -i'' -e '/;inkstitch-version/ a\'$'\n'"${version_block}"'' win/win_build.iss
sed -i'' -e '/;arch-allowed/ a\'$'\n'"ArchitecturesAllowed=x64 arm64"'' win/win_build.iss sed -i'' -e '/;arch-allowed/ a\'$'\n'"ArchitecturesAllowed=x64 arm64"'' win/win_build.iss
iscc win/win_build.iss iscc win/win_build.iss
mv win/inkstitch.exe artifacts/inkstitch-${VERSION}-${OS}-${ARCH}.exe mv win/inkstitch.exe ${DIRECTORY}/inkstitch-${VERSION}-${OS}-${ARCH}.exe
cd dist cd dist
echo "Creating zip" echo "Creating zip"
if [[ -d "../signed-artifacts" ]]; then
DIRECTORY="signed-artifacts"
echo "Found signed artifacts"
else
if [[ ! -d "../signed-artifacts" ]]; then
DIRECTORY="signed-artifacts"
echo "Created signed artifacts"
else
DIRECTORY="artifacts"
echo "No signed artifacts found, local build"
fi
fi
# The python zipfile command line utility can't handle directories # The python zipfile command line utility can't handle directories
# containing files with UTF-8 names on Windows, so we use 7-zip instead. # containing files with UTF-8 names on Windows, so we use 7-zip instead.