From b1d82308dbd3f14642e50a9bd67bfa483763a129 Mon Sep 17 00:00:00 2001 From: lanefu Date: Mon, 19 Jul 2021 20:36:46 -0400 Subject: [PATCH] RC upload flag (#3027) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * RC upload flag * Update build-all-ng.sh * Try RC Images Co-authored-by: Igor Pečovnik --- .github/workflows/build-RC-images.yml | 1097 +++++++++++++++++++++++++ config/targets-cli-RC.conf | 299 +++++++ config/targets-desktop-RC.conf | 76 ++ lib/build-all-ng.sh | 1 + lib/debootstrap.sh | 6 +- 5 files changed, 1477 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build-RC-images.yml create mode 100644 config/targets-cli-RC.conf create mode 100644 config/targets-desktop-RC.conf diff --git a/.github/workflows/build-RC-images.yml b/.github/workflows/build-RC-images.yml new file mode 100644 index 0000000000..393b2bd3eb --- /dev/null +++ b/.github/workflows/build-RC-images.yml @@ -0,0 +1,1097 @@ +name: RC Images + +on: + + workflow_dispatch: + inputs: + branch: + description: 'Release Branch To Test' + required: true + default: 'v21.08-RC' + +jobs: + + worker-1: + + name: CLI worker 1/5 + runs-on: [self-hosted, Linux, images] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/5000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-cli-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-0.conf userpatches/targets.conf # Building chunk 1 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-2: + + name: CLI worker 2/5 + runs-on: [self-hosted, Linux, images] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/5000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-cli-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-1.conf userpatches/targets.conf # Building chunk 2 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-3: + + name: CLI worker 3/5 + runs-on: [self-hosted, Linux, images] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/5000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-cli-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-2.conf userpatches/targets.conf # Building chunk 3 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-4: + + name: CLI worker 4/5 + runs-on: [self-hosted, Linux, images] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/5000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-cli-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-3.conf userpatches/targets.conf # Building chunk 4 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-5: + + name: CLI worker 5/5 + runs-on: [self-hosted, Linux, images] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/2000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-cli-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-4.conf userpatches/targets.conf # Building chunk 5 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-a: + + name: Desktop worker 1/5 + runs-on: [self-hosted, Linux, images, big] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-desktop-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-0.conf userpatches/targets.conf # Building chunk 1 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-b: + + name: Desktop worker 2/5 + runs-on: [self-hosted, Linux, images, big] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-desktop-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-1.conf userpatches/targets.conf # Building chunk 2 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-c: + + name: Desktop worker 3/5 + runs-on: [self-hosted, Linux, images, big] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-desktop-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-2.conf userpatches/targets.conf # Building chunk 3 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-d: + + name: Desktop worker 4/5 + runs-on: [self-hosted, Linux, images, big] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-desktop-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-3.conf userpatches/targets.conf # Building chunk 4 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + worker-e: + + name: Desktop worker 5/5 + runs-on: [self-hosted, Linux, images, big] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Fix permissions + run: | + + # make sure no temporally dirs are mounted from previous runs + while : + do + sudo pkill compile.sh || true + sudo pkill arm-binfmt-P || true + sudo pkill aarch64-binfmt-P || true + sudo pkill pixz || true + [[ "$(df | grep "/.tmp" | wc -l)" -eq 0 ]] && sudo rm -rf build/.tmp && break + echo "Mounted temp directories. Trying to unmount." + df | grep ".tmp" | awk '{print $6}' | xargs sudo umount 2>/dev/null || true + sleep 10 + done + + sudo chown -R $USER:$USER . + + - name: Checkout Armbian build script + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/build + path: build + ref: ${{ github.events.inputs.branch }} + clean: false + + - name: Checkout Armbian support scripts + + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: armbian/scripts + token: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + path: scripts + clean: false + + - name: Import GPG key + + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.GPG_KEY1 }} + passphrase: ${{ secrets.GPG_PASSPHRASE1 }} + workdir: scripts + git-user-signingkey: true + git-commit-gpgsign: true + + - name: Build RC images + env: + GPG_PASS: ${{ secrets.GPG_PASSPHRASE1 }} + + run: | + + cd build + + # use prepared configs + sudo cp ../scripts/configs/* userpatches/ + + # prepare host + [[ ! -f .ignore_changes ]] && sudo touch .ignore_changes + ./compile.sh KERNEL_ONLY="yes" BOARD="bananapi" BRANCH="current" KERNEL_CONFIGURE="no" USE_TORRENT="yes" REPOSITORY_INSTALL="kernel" 'prepare_host' + + # sync rootfs + mkdir -p cache/rootfs/ + sudo rsync --size-only --delete -avr rsync://rsync.armbian.com/dl/_rootfs/. cache/rootfs/ + + # calculate how many images we can build in parallel + PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024))) + + # cleaning leftovers if any + rm -rf output/images/* output/debs-beta/* output/debs/* + + # split into 5 build chunks + cat config/targets-desktop-RC.conf | grep -v "^$" | grep -v "^#" > userpatches/split.conf + split -d --number=l/5 --additional-suffix=.conf --suffix-length=1 userpatches/split.conf userpatches/split- + + sudo ln -sf split-4.conf userpatches/targets.conf # Building chunk 5 + + ./compile.sh all-new-RC-images MULTITHREAD="${PARALLEL_BUILDS}" GPG_PASS="${GPG_PASS}" + + - name: Install SSH key for storage + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + known_hosts: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + if_key_exists: replace + + - name: Deploy to server + + if: ${{ success() }} + + run: | + + sudo apt-get -y -qq install lftp + sudo chown -R $USER:$USER $(pwd)/build/output/images/ + lftp -u upload, -e "set net:timeout 4;set net:max-retries 6;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/images/ images/ ;bye" sftp://users.armbian.com + + torrents: + + # + # Rebuilt torrent files for rootfs cache + # + + name: Update download infrastructure + needs: [worker-1, worker-2, worker-3, worker-4, worker-5, worker-a, worker-b, worker-c, worker-d, worker-e] + runs-on: [self-hosted, Linux, local] + if: ${{ github.repository_owner == 'Armbian' }} + steps: + + - name: Install SSH key for torrent + + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.KEY_TORRENTS }} + name: id_torrent # optional + known_hosts: ${{ secrets.KNOWN_HOSTS_TORRENTS }} + if_key_exists: replace + + - name: Create torrents + + run: ssh -T -i ~/.ssh/id_torrent ${{ secrets.USER_TORRENTS }}@${{ secrets.HOST_TORRENTS }} diff --git a/config/targets-cli-RC.conf b/config/targets-cli-RC.conf new file mode 100644 index 0000000000..643efa99e9 --- /dev/null +++ b/config/targets-cli-RC.conf @@ -0,0 +1,299 @@ +#################################################################################################################### +# board branch release desktop|cli|minimal stable|beta create images # +#################################################################################################################### + +# Bananapi M1 / M1+ A20 +bananapi current focal cli beta yes + + +# Bananapi Pro A20 +bananapipro current focal cli beta yes + + +# Bananapi M2+ H3 +bananapim2plus current focal cli beta yes + + +# Helios64 +helios64 current focal cli beta yes + + +# Cubietruck +cubietruck current focal cli beta yes + + +# Espressobin +espressobin current focal cli beta yes + + +# Jetson Nano +jetson-nano current focal cli beta yes + + +# Khadas Vim1 +khadas-vim1 current focal cli beta yes + + +# Khadas Vim2 +khadas-vim2 current focal cli beta yes + + +# Khadas Vim3l +khadas-vim3l current focal cli beta yes + + +# Khadas Edge +khadas-current current focal cli beta yes + + +# Lepotato +lepotato current focal cli beta yes + + +# Olimex Lime2 +lime2 current focal cli beta yes + + +# Olimex Lime A64 +lime-a64 current focal cli beta yes + + +# nanopct4 +nanopct4 current focal cli beta yes + + +# nanopi-r1 +nanopi-r1 current focal cli beta yes + + +# nanopi-r2s +nanopi-r2s current focal cli beta yes + + +# nanopi-r4s +nanopi-r4s current focal cli beta yes + + +# nanopiair +nanopiair current focal cli beta yes + + +# nanopiduo2 +nanopiduo2 current focal cli beta yes + + +# nanopik1plus +nanopik1plus current focal cli beta yes + + +# nanopik2-905 +nanopik2-s905 current focal cli beta yes + + +# nanopim4 +nanopim4 current focal cli beta yes + + +# nanopim4v2 +nanopim4v2 current focal cli beta yes + + +# nanopineo +nanopineo current focal cli beta yes + + +# nanopineocore2 +nanopineo2 current focal cli beta yes + + +# nanopineo2black +nanopineo2black current focal cli beta yes + + +# nanopineo3 +nanopineo3 current focal cli beta yes + + +# nanopineo4 +nanopineo4 current focal cli beta yes + + +# nanopineocore2 +nanopineocore2 current focal cli beta yes + + +# Odroid C2 +odroidc2 current focal cli beta yes + + +# Odroid N2 / N2+ +odroidn2 current focal cli beta yes + + +# Odroid C4 +odroidc4 current focal cli beta yes + + +# Odroid HC4 +odroidhc4 current focal cli beta yes + + +# Odroid XU4 +odroidxu4 current focal cli beta yes + + +# orangepi2 +orangepi2 current focal cli beta yes + + +# orangepi 3 +orangepi3 current focal cli beta yes + + +# Orangepi 4 +orangepi4 current focal cli beta yes + + +# Orangepi R1 +orangepi-r1 current focal cli beta yes + + +# Orangepi R1+ +orangepi-r1plus current focal cli beta yes + + +# orangepilite +orangepilite current focal cli beta yes + + +# orangepilite2 +orangepilite2 current focal cli beta yes + + +# orangepioneplus +orangepioneplus current focal cli beta yes + + +# orangepione +orangepione current focal cli beta yes + + +# orangepipc +orangepipc current focal cli beta yes + + +# orangepipc2 +orangepipc2 current focal cli beta yes + + +# orangepipcplus +orangepipcplus current focal cli beta yes + + +# orangepiplus +orangepiplus current focal cli beta yes + + +# orangepiplus2e +orangepiplus2e current focal cli beta yes + + +# Orangepi Prime +orangepiprime current focal cli beta yes + + +# Orangepi Win +orangepiwin current focal cli beta yes + + +# orangepizero +orangepizero current focal cli beta yes + + +# orangepizero2 +orangepizero2 current focal cli beta yes + + +# orangepizeroplus +orangepizeroplus current focal cli beta yes + + +# orangepizeroplus2-h3 +orangepizeroplus2-h3 current focal cli beta yes + + +# orangepizeroplus2-h5 +orangepizeroplus2-h5 current focal cli beta yes + + +# Pine64 +pine64 current focal cli beta yes + + +# Pine64so +pine64so current focal cli beta yes + + +# rk322x-box +rk322x-box current focal cli beta yes + + +# Rock64 +rock64 current focal cli beta yes + + +# Rockpi 4a +rockpi-4a current focal cli beta yes + + +# Rockpi 4b +rockpi-4b current focal cli beta yes + + +# Rockpi 4c +rockpi-4c current focal cli beta yes + + +# Rockpi S +rockpi-s current focal minimal beta yes + + +# Rockpi E +rockpi-e current focal cli beta yes + + +# Rock64pro +rockpro64 current focal cli beta yes + + +# Tinkerboard +tinkerboard current focal cli beta yes + + +# Station M1 +station-m1 current focal cli beta no + + +# Station P1 +station-p1 current focal cli beta no + + +# Tinkerboard 2 +tinkerboard-2 current focal cli beta yes + + +# tritium-h3 +tritium-h3 current focal cli beta yes + + +# tritium-h5 +tritium-h5 current focal cli beta yes + + +# zeropi +zeropi current focal cli beta yes + + +# Virtual qemu +virtual-qemu current focal cli beta yes +virtual-qemu current hirsute cli beta yes diff --git a/config/targets-desktop-RC.conf b/config/targets-desktop-RC.conf new file mode 100644 index 0000000000..a55e8a3e69 --- /dev/null +++ b/config/targets-desktop-RC.conf @@ -0,0 +1,76 @@ +########################################################################################################################################################### +# board branch release desktop|cli|minimal stable|beta create images DE DE config Comma delimited app groups # +########################################################################################################################################################### + +# Lepotato +lepotato current hirsute desktop beta yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# nanopct4 +nanopct4 current hirsute desktop beta yes budgie config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# nanopim4v2 +nanopim4v2 current hirsute desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# Odroid C2 +odroidc2 current hirsute desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# Odroid N2 +odroidn2 current hirsute desktop beta yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop +odroidn2 current hirsute desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# Odroid C4 +odroidc4 current focal desktop beta yes budgie config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop +odroidc4 current focal desktop beta yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# orangepi 3 +orangepi3 current focal desktop beta yes xfce config_base 3dsupport,browsers + + +# Orangepi 4 +orangepi4 current focal desktop beta yes xfce config_base 3dsupport,browsers + + +# orangepipc2 +orangepipc2 current focal desktop beta yes xfce config_base 3dsupport,browsers + + +# Pinebook A64 +pinebook-a64 current hirsute desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# Pinebook PRO +pinebook-pro current hirsute desktop beta yes budgie config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop +pinebook-pro current hirsute desktop beta yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop +pinebook-pro current hirsute desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# qemu virtual images +virtual-qemu current focal desktop beta yes budgie config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop +virtual-qemu current focal desktop beta yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop +virtual-qemu current focal desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# Rockpi 4a +rockpi-4a current focal desktop beta yes xfce config_base 3dsupport,browsers + + +# Rockpi 4b +rockpi-4b current focal desktop beta yes xfce config_base 3dsupport,browsers + + +# Rockpi 4c +rockpi-4c current focal desktop beta yes xfce config_base 3dsupport,browsers + + +#tinkerboard 2 +tinkerboard-2 current hirsute desktop beta yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop + + +# tritium-h5 +tritium-h5 current focal desktop beta yes xfce config_base 3dsupport,browsers diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh index 848be3af4a..f6b07f485c 100644 --- a/lib/build-all-ng.sh +++ b/lib/build-all-ng.sh @@ -79,6 +79,7 @@ pack_upload () [[ $BUILD_DESKTOP == yes ]] && version=${version}_desktop [[ $BUILD_MINIMAL == yes ]] && version=${version}_minimal [[ $BETA == yes ]] && local subdir=nightly + [[ $RC == yes ]] && local subdir=rc cd "${DESTIMG}" || exit diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index 0c41c3266e..dd25f54b20 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -764,9 +764,11 @@ create_image() FINALDEST=$DEST/images if [[ $BUILD_ALL == yes ]]; then - if [[ "$BETA" == yes ]]; then + if [[ "$BETA" == yes && "$RC" == yes ]]; then + FINALDEST=$DEST/images/"${BOARD}"/RC + elif [["$BETA" == yes ]]; then FINALDEST=$DEST/images/"${BOARD}"/nightly - else + else FINALDEST=$DEST/images/"${BOARD}"/archive fi install -d -o nobody -g nogroup -m 775 ${FINALDEST}