diff --git a/.github/workflows/build-beta-images.yml b/.github/workflows/build-beta-images.yml index 8235a27651..0efe9d5b60 100644 --- a/.github/workflows/build-beta-images.yml +++ b/.github/workflows/build-beta-images.yml @@ -53,6 +53,29 @@ jobs: SSH_KEY_TORRENTS: ${{ secrets.KEY_TORRENTS }} KNOWN_HOSTS_UPLOAD: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + x86-desktop: + needs: [ merge ] + uses: armbian/scripts/.github/workflows/build-with-docker.yml@master + + with: + + variant: 'desktop:beta' + runner: "big" + part: 1 + of: 1 + include: 'grep uefi-x86 | ' + exclude: '' + uploading: false + + secrets: + GPG_KEY1: ${{ secrets.GPG_KEY1 }} + GPG_PASSPHRASE1: ${{ secrets.GPG_PASSPHRASE1 }} + GPG_KEY2: ${{ secrets.GPG_KEY2 }} + GPG_PASSPHRASE2: ${{ secrets.GPG_PASSPHRASE2 }} + SCRIPTS_ACCESS_TOKEN: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + SSH_KEY_TORRENTS: ${{ secrets.KEY_TORRENTS }} + KNOWN_HOSTS_UPLOAD: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + cli: needs: [ merge ] uses: armbian/scripts/.github/workflows/build-with-docker.yml@master @@ -101,7 +124,7 @@ jobs: jobsend: name: finish - needs: [x86,cli,desktop] + needs: [x86,x86-desktop,cli,desktop] runs-on: [ubuntu-latest] if: ${{ github.repository_owner == 'Armbian' }} steps: diff --git a/.github/workflows/build-train.yml b/.github/workflows/build-train.yml index 77de1d1099..4d3ff9249a 100644 --- a/.github/workflows/build-train.yml +++ b/.github/workflows/build-train.yml @@ -231,11 +231,11 @@ jobs: ########################################################################################## # # - # Build x86 images # + # Build x86 CLI images # # # ########################################################################################## - x86-images: + x86-cli-images: needs: [apt-armbian-com,beta-armbian-com] uses: armbian/scripts/.github/workflows/build-with-docker.yml@master @@ -258,6 +258,35 @@ jobs: SSH_KEY_TORRENTS: ${{ secrets.KEY_TORRENTS }} KNOWN_HOSTS_UPLOAD: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + ########################################################################################## + # # + # Build x86 desktop images # + # # + ########################################################################################## + + x86-desktop-images: + needs: [apt-armbian-com,beta-armbian-com] + uses: armbian/scripts/.github/workflows/build-with-docker.yml@master + + with: + + variant: 'desktop:beta' + runner: "ubuntu-latest" + part: 1 + of: 1 + include: 'grep uefi-x86 | ' + exclude: '' + uploading: false + + secrets: + GPG_KEY1: ${{ secrets.GPG_KEY1 }} + GPG_PASSPHRASE1: ${{ secrets.GPG_PASSPHRASE1 }} + GPG_KEY2: ${{ secrets.GPG_KEY2 }} + GPG_PASSPHRASE2: ${{ secrets.GPG_PASSPHRASE2 }} + SCRIPTS_ACCESS_TOKEN: ${{ secrets.SCRIPTS_ACCESS_TOKEN }} + SSH_KEY_TORRENTS: ${{ secrets.KEY_TORRENTS }} + KNOWN_HOSTS_UPLOAD: ${{ secrets.KNOWN_HOSTS_UPLOAD }} + ########################################################################################## # # # Build CLI images # @@ -322,7 +351,7 @@ jobs: ########################################################################################## Bump: - needs: [x86-images,cli-images,desktop-images] + needs: [x86-cli-images,x86-desktop-images,cli-images,desktop-images] if: ${{ success() && github.repository_owner == 'Armbian' }} uses: armbian/scripts/.github/workflows/update-version.yml@master