diff --git a/flatpak/generic-build.pipeline b/flatpak/build-arm.pipeline copy from flatpak/generic-build.pipeline copy to flatpak/build-arm.pipeline --- a/flatpak/generic-build.pipeline +++ b/flatpak/build-arm.pipeline @@ -1,5 +1,5 @@ // Request a node to be allocated to us -node( "Flatpak" ) { +node( "Flatpak&&arm" ) { // We want Timestamps on everything timestamps { // We want to catch any errors that occur to allow us to send out notifications (ie. emails) if needed @@ -22,7 +22,7 @@ extensions: [[$class: 'CloneOption', timeout: 120]], userRemoteConfigs: [[url: repositoryUrl]] ] - + // General Flatpak build recipe repository checkout changelog: false, poll: false, scm: [ $class: 'GitSCM', @@ -43,12 +43,12 @@ cd ~/jenkins/ BUILD_DATE=`date` - flatpak-builder --force-clean --delete-build-dirs --arch=x86_64 --ccache --sandbox --user --install-deps-from=flathub --repo=\$HOME/staging-repo/ --subject="Built on \$BUILD_DATE" app "\$WORKSPACE/${manifest}" + flatpak-builder --force-clean --delete-build-dirs --arch=arm --ccache --sandbox --user --install-deps-from=flathub --repo=\$HOME/staging-repo/ --subject="Built on \$BUILD_DATE" app "\$WORKSPACE/${manifest}" rm -rf app/ """ } - + // Run the repository export preparation process stage('Exporting Repository') { @@ -59,12 +59,12 @@ } // Finally we can sign the repository - stage('Publishing Repository') { + stage('Preparing Repository') { // Sign and then upload the repository to the final server sh """ - flatpak build-commit-from --src-repo=\$HOME/staging-repo --gpg-sign=61C45BED \$HOME/public-repo --update-appstream - flatpak build-update-repo --prune --prune-depth=20 --generate-static-deltas --gpg-sign=61C45BED \$HOME/public-repo - rsync -Ha --delete \$HOME/public-repo/ flatpak@racnoss.kde.org:/srv/www/distribute.kde.org/flatpak-apps-testing/ + flatpak build-commit-from --src-repo=\$HOME/staging-repo --gpg-sign=4D669FB6 \$HOME/repo-arm --update-appstream + flatpak build-update-repo --prune --prune-depth=20 --generate-static-deltas --gpg-sign=4D669FB6 \$HOME/repo-arm + #repository will be read by publish-arm.pipeline """ } } diff --git a/flatpak/generic-build.pipeline b/flatpak/generic-build.pipeline --- a/flatpak/generic-build.pipeline +++ b/flatpak/generic-build.pipeline @@ -1,5 +1,5 @@ // Request a node to be allocated to us -node( "Flatpak" ) { +node( "Flatpak&&x86_64" ) { // We want Timestamps on everything timestamps { // We want to catch any errors that occur to allow us to send out notifications (ie. emails) if needed