enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable x86 desktop build targets (#3431)

Browse Source 
* Enable x86 desktop build targets
* Also fix build train
This commit is contained in:
Igor Pečovnik 2022-01-24 16:32:23 +01:00 committed by GitHub
parent 1411efaa10
commit 459ebf8d15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.github/workflows/build-beta-images.yml vendored
View File

@ -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:

35
.github/workflows/build-train.yml vendored
View File

@ -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