From 91c771ccd6fb5b2c93644cb67ecfa85891a33cc6 Mon Sep 17 00:00:00 2001
From: Paulchen Panther <Paulchen-Panter@protonmail.com>
Date: Mon, 20 Apr 2020 18:46:51 +0200
Subject: [PATCH] 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>
---
 .azure.yml                         | 9 ++-------
 .github/workflows/pull-request.yml | 6 ++----
 .github/workflows/push-master.yml  | 5 +----
 cmake/packages.cmake               | 3 ++-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.azure.yml b/.azure.yml
index 383d6eb7..71f9a587 100644
--- a/.azure.yml
+++ b/.azure.yml
@@ -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/*
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index a392d134..7bef1cc8 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -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
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index 9e14143c..5a509a2e 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -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
diff --git a/cmake/packages.cmake b/cmake/packages.cmake
index c065f828..1aabfb84 100644
--- a/cmake/packages.cmake
+++ b/cmake/packages.cmake
@@ -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" )