fix broken rebase

merge-requests/237/head lin_flatpaks3
nr0q 2023-10-22 14:32:56 -05:00
rodzic fd03727373
commit 94d1dd836a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 3996435FD92CC88F
1 zmienionych plików z 20 dodań i 48 usunięć

Wyświetl plik

@ -268,64 +268,36 @@ arm:package:
- | - |
# This is for ARM 32 arch build # This is for ARM 32 arch build
test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1) test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
VER=`node version.js` echo -e "\e[0Ksection_start:`date +%s`:wget[collapsed=true]\r\e[0KGetting Upstream NWJS Binary"
echo "Getting Upstream NWJS arm32 Binary" wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS32_BUILD/$NWJS32_BUILD.tar.gz
wget -q https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS32_BUILD/$NWJS32_BUILD.tar.gz
echo "Extracting $NWJS32_BUILD.tar.gz...."
tar -xf $NWJS32_BUILD.tar.gz tar -xf $NWJS32_BUILD.tar.gz
rm $NWJS32_BUILD.tar.gz
echo "Extracting $nwjs-$NWJS_VERSION-linux-arm.tar.gz..."
tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm.tar.gz tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm.tar.gz
rm -rf usr/ echo -e "\e[0Ksection_end:`date +%s`:wget\r\e[0K"
echo "Removing unused locales/*.info files..."
rm nwjs-$NWJS_VERSION-linux-arm/locales/*.info rm nwjs-$NWJS_VERSION-linux-arm/locales/*.info
echo "Merging $nwjs-$NWJS_VERSION-linux-arm binary with GridTracker..."
mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker
version=`node ./version.js` VER=`node ./version.js`
mkdir GridTracker-${VER}-linux-arm32 mkdir GridTracker-$version-linux-arm32
cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-${VER}-linux-arm32/ cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-$VER-linux-arm32/
cp -r arm/* GridTracker-${VER}-linux-arm32/ cp -r arm/* GridTracker-$VER-linux-arm32/
cp -r package.nw GridTracker-${VER}-linux-arm32/ cp -r package.nw GridTracker-$VER-linux-arm32/
cp LICENSE GridTracker-${VER}-linux-arm32/ cp LICENSE GridTracker-$VER-linux-arm32/
echo "Compressing GridTracker-${VER}-linux-arm32.tar.gz..." tar -czf GridTracker-$VER-linux-arm32.tar.gz GridTracker-$VER-linux-arm32
tar -czf GridTracker-${VER}-linux-arm32.tar.gz GridTracker-${VER}-linux-arm32 mv GridTracker-$VER-linux-arm32.tar.gz artifacts/
mv GridTracker-${VER}-linux-arm32.tar.gz artifacts/
echo "GridTracker-${VER}-linux-arm32.tar.gz built."
rm -rf nwjs-$NWJS_VERSION-linux-arm
# This is for ARM 64 arch build # This is for ARM 64 arch build
echo "Getting Upstream NWJS arm64 Binary" wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS64_BUILD/$NWJS64_BUILD.tar.gz
wget -q https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS64_BUILD/$NWJS64_BUILD.tar.gz
echo "Extracting $NWJS64_BUILD.tar.gz...."
tar -xf $NWJS64_BUILD.tar.gz tar -xf $NWJS64_BUILD.tar.gz
rm $NWJS64_BUILD.tar.gz
echo "Extracting $nwjs-$NWJS_VERSION-linux-arm64.tar.gz..."
tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm64.tar.gz tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm64.tar.gz
rm -rf usr
echo "Removing unused locales/*.info files..."
rm nwjs-$NWJS_VERSION-linux-arm64/locales/*.info rm nwjs-$NWJS_VERSION-linux-arm64/locales/*.info
echo "Merging $nwjs-$NWJS_VERSION-linux-arm64 binary with GridTracker..."
mv nwjs-$NWJS_VERSION-linux-arm64/nw nwjs-$NWJS_VERSION-linux-arm64/GridTracker mv nwjs-$NWJS_VERSION-linux-arm64/nw nwjs-$NWJS_VERSION-linux-arm64/GridTracker
version=`node ./version.js`
mkdir GridTracker-$version-linux-arm64 mkdir GridTracker-$version-linux-arm64
cp -r nwjs-$NWJS_VERSION-linux-arm64/* GridTracker-$version-linux-arm64/ cp -r nwjs-$NWJS_VERSION-linux-arm64/* GridTracker-$VER-linux-arm64/
cp -r arm/* GridTracker-$version-linux-arm64/ cp -r arm/* GridTracker-$VER-linux-arm64/
cp -r package.nw GridTracker-$version-linux-arm64/ cp -r package.nw GridTracker-$VER-linux-arm64/
cp LICENSE GridTracker-$version-linux-arm64/ cp LICENSE GridTracker-$VER-linux-arm64/
tar -czf GridTracker-$version-linux-arm64.tar.gz GridTracker-$version-linux-arm64 tar -czf GridTracker-$VER-linux-arm64.tar.gz GridTracker-$VER-linux-arm64
mv GridTracker-$version-linux-arm64.tar.gz artifacts/ mv GridTracker-$VER-linux-arm64.tar.gz artifacts/
gpg --batch --no-tty --detach-sign --armor --passphrase ${GPG_PASS} artifacts/GridTracker*arm32.tar.gz gpg --batch --no-tty --detach-sign --armor --passphrase ${GPG_PASS} artifacts/GridTracker-$VER-arm32.tar.gz
gpg --batch --no-tty --detach-sign --armor --passphrase ${GPG_PASS} artifacts/GridTracker*arm64.tar.gz gpg --batch --no-tty --detach-sign --armor --passphrase ${GPG_PASS} artifacts/GridTracker_$VER-arm64.tar.gz
VER=`node version.js`
mkdir GridTracker-${VER}-linux-arm64
cp -r nwjs-$NWJS_VERSION-linux-arm64/* GridTracker-${VER}-linux-arm64/
cp -r arm/* GridTracker-${VER}-linux-arm64/
cp -r package.nw GridTracker-${VER}-linux-arm64/
cp LICENSE GridTracker-${VER}-linux-arm64/
echo "Compressing GridTracker-${VER}-linux-arm64.tar.gz..."
tar -czf GridTracker-${VER}-linux-arm64.tar.gz GridTracker-${VER}-linux-arm64
mv GridTracker-${VER}-linux-arm64.tar.gz artifacts/
echo "GridTracker-${VER}-linux-arm32.tar.gz built."
rm -rf nwjs-$NWJS-VERSION-linux-arm64
# This is for ARM 64 Flatpaks # This is for ARM 64 Flatpaks
echo -e "\e[0Ksection_start:`date +%s`:flatpaks[collapsed=true]\r\e[0KBuilding Flatpak" echo -e "\e[0Ksection_start:`date +%s`:flatpaks[collapsed=true]\r\e[0KBuilding Flatpak"
echo "Creating workdir..." echo "Creating workdir..."