i386 architecture removed

AArch64 architecture paused at package creation
Self extracting Tar GZip compression (STGZ) packages are no longer built

Signed-off-by: Paulchen Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen Panther 2020-04-20 18:46:51 +02:00
parent e3587923e8
commit 91c771ccd6
4 changed files with 7 additions and 16 deletions

View File

@ -18,10 +18,6 @@ stages:
dockerTag: 'amd64'
dockerName: 'Debian Stretch (AMD64)'
platform: 'x11'
i386 (x86):
dockerTag: 'i386'
dockerName: 'Debian Stretch (i386)'
platform: 'x11'
ARMv6hf (Raspberry Pi v1 & ZERO):
dockerTag: 'armv6hf'
dockerName: 'Debian Stretch (Raspberry Pi v1 & ZERO)'
@ -50,7 +46,7 @@ stages:
# move files
- bash: 'mv -v deploy/Hyperion-* $(Build.ArtifactStagingDirectory) 2>/dev/null || :'
workingDirectory: $(Build.SourcesDirectory)
condition: and(succeeded(), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
condition: and(succeeded(), ne(variables['system.pullrequest.isfork'], true), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
displayName: 'Collect artifacts'
# publish artifacts
@ -58,7 +54,7 @@ stages:
inputs:
pathtoPublish: $(Build.ArtifactStagingDirectory)
ArtifactName: $(dockerTag)
condition: and(succeeded(), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
condition: and(succeeded(), in(variables['dockerTag'], 'amd64', 'armv6hf', 'armv7hf'), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
displayName: 'Publish artifacts'
######################
@ -149,7 +145,6 @@ stages:
title: 'Hyperion $(semVer)'
assets: |
$(Build.ArtifactStagingDirectory)/amd64/*
$(Build.ArtifactStagingDirectory)/i386/*
$(Build.ArtifactStagingDirectory)/armv6hf/*
$(Build.ArtifactStagingDirectory)/armv7hf/*
$(Build.ArtifactStagingDirectory)/aarch64/*

View File

@ -15,14 +15,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dockerTag: [ amd64, i386, armv6hf, armv7hf, aarch64 ]
dockerTag: [ amd64, armv6hf, armv7hf, aarch64 ]
include:
- dockerTag: amd64
dockerName: Debian Stretch (AMD64)
platform: x11
- dockerTag: i386
dockerName: Debian Stretch (i386)
platform: x11
- dockerTag: armv6hf
dockerName: Debian Stretch (Raspberry Pi v1 & ZERO)
platform: rpi
@ -61,6 +58,7 @@ jobs:
run: |
mkdir -p ${{ matrix.dockerTag }}
mv deploy/*.tar.gz ${{ matrix.dockerTag }}
if: matrix.dockerTag != 'aarch64'
# Upload artifacts
- name: Upload artifacts

View File

@ -14,14 +14,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dockerTag: [ amd64, i386, armv6hf, armv7hf, aarch64 ]
dockerTag: [ amd64, armv6hf, armv7hf, aarch64 ]
include:
- dockerTag: amd64
dockerName: Debian Stretch (AMD64)
platform: x11
- dockerTag: i386
dockerName: Debian Stretch (i386)
platform: x11
- dockerTag: armv6hf
dockerName: Debian Stretch (Raspberry Pi v1 & ZERO)
platform: rpi

View File

@ -4,7 +4,7 @@
IF (APPLE)
SET ( CPACK_GENERATOR "TGZ" "Bundle")
ELSEIF (UNIX)
SET ( CPACK_GENERATOR "TGZ" "STGZ")
SET ( CPACK_GENERATOR "TGZ")
ELSEIF (WIN32)
SET ( CPACK_GENERATOR "ZIP")
ENDIF()
@ -55,6 +55,7 @@ SET ( CPACK_DEBIAN_PACKAGE_SECTION "Miscellaneous" )
SET ( CPACK_RPM_PACKAGE_RELEASE 1)
SET ( CPACK_RPM_PACKAGE_LICENSE "MIT")
SET ( CPACK_RPM_PACKAGE_GROUP "Applications")
# Notes: This is a dependency list for Fedora 27, different .rpm OSes use different names for their deps
SET ( CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rpm/preinst" )
SET ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rpm/postinst" )