diff --git a/.github/workflows/build-beta-desktop.yml b/.github/workflows/build-beta-desktop.yml index e78a6e978e..13b1b58bf6 100644 --- a/.github/workflows/build-beta-desktop.yml +++ b/.github/workflows/build-beta-desktop.yml @@ -1,10 +1,10 @@ -name: Build Beta Desktop Packages +name: Build Beta Desktop on: -# schedule: -# - cron: '0 4 * * *' - workflow_dispatch: + workflow_run: + workflows: ["Build Beta Kernel"] + types: [completed] jobs: @@ -12,7 +12,7 @@ jobs: name: Find desktop variants runs-on: ubuntu-latest - #if: ${{ github.repository_owner == 'Armbian' }} + if: ${{ github.repository_owner == 'Armbian' }} outputs: matrix: ${{steps.list_dirs.outputs.matrix}} steps: @@ -59,8 +59,8 @@ jobs: with: fetch-depth: 0 repository: armbian/build - ref: nightly path: build + ref: nightly clean: true - name: Checkout support scripts @@ -71,11 +71,6 @@ jobs: path: scripts clean: true - - name: Sync - run: | - mkdir -p build/userpatches - sudo cp scripts/configs/* build/userpatches/ - - name: Pull Docker image run: | @@ -84,13 +79,15 @@ jobs: - name: Build package run: | + mkdir -p build/userpatches + cp scripts/configs/* build/userpatches/ cd build CHUNK="${{ matrix.node }}" RELEASE=$(echo $CHUNK | cut -d":" -f1) DE=$(echo $CHUNK | cut -d":" -f2) echo "RELEASE=${RELEASE}" >> $GITHUB_ENV echo "DE=${DE}" >> $GITHUB_ENV - sed -i "s/-it --rm/-i --rm/" userpatches/config-docker.conf + sed -i "s/-it --rm/-i --rm/" userpatches/config-docker.conf ./compile.sh docker \ BSP_BUILD="yes" \ BETA="yes" \ @@ -129,9 +126,8 @@ jobs: if_key_exists: replace - name: Deploy to server - if: ${{ matrix.node != 'none:none' && env.UPLOAD == true }} + if: ${{ matrix.node != 'none:none' }} && {{ env.UPLOAD == true }} run: | - sudo apt-get -y -qq install lftp - lftp -u upload, -e "set net:timeout 10;set net:max-retries 16;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/debs/ debs/ ;bye" sftp://users.armbian.com - lftp -u upload, -e "set net:timeout 10;set net:max-retries 16;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/debs-beta/ debs-beta/ ;bye" sftp://users.armbian.com + sudo apt-get -y -qq install lftp + lftp -u upload, -e "set net:timeout 10;set net:max-retries 16;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --include-glob=armbian-${{ env.RELEASE }}-desktop-${{ env.DE }}_*.deb --no-perms $(pwd)/build/output/debs-beta/ debs-beta/ ;bye" sftp://users.armbian.com \ No newline at end of file diff --git a/.github/workflows/update-repository.yml b/.github/workflows/update-repository.yml index 19ef53335e..8cbd5a8877 100644 --- a/.github/workflows/update-repository.yml +++ b/.github/workflows/update-repository.yml @@ -3,7 +3,7 @@ name: Update Repository on: workflow_dispatch: workflow_run: - workflows: ["Build Beta Kernel"] + workflows: ["Build Beta Desktop"] types: [completed] jobs: