Update packging for release builds

solidpixel · solidpixel · commit c334d8eff8e5 · 2021-01-04T18:12:12.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -126,7 +126,7 @@ endif()
 
 set(PKG_VER ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR})
 
-set(CPACK_PACKAGE_FILE_NAME "astcenc-${PKG_VER}-${PKG_OS}-x64")
+set(CPACK_PACKAGE_FILE_NAME "astcenc-${PKG_VER}-${PKG_OS}-${ARCH}")
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE)
 set(CPACK_PACKAGE_CHECKSUM SHA256)
 set(CPACK_GENERATOR ZIP)
diff --git a/jenkins/release.Jenkinsfile b/jenkins/release.Jenkinsfile
@@ -238,7 +238,6 @@ pipeline {
                 '''
               }
             }
-            /*
             stage('Sign and notarize') {
               environment {
                 NOTARIZATION_CREDS = credentials('notarization-account')
@@ -258,7 +257,6 @@ pipeline {
                 }
               }
             }
-            */
             stage('Stash') {
               steps {
                 dir('build_rel') {

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,6 @@ pipeline {`
`238`	`238`	`'''`
`239`	`239`	`}`
`240`	`240`	`}`
`241`		`- /*`
`242`	`241`	`stage('Sign and notarize') {`
`243`	`242`	`environment {`
`244`	`243`	`NOTARIZATION_CREDS = credentials('notarization-account')`
`@@ -258,7 +257,6 @@ pipeline {`
`258`	`257`	`}`
`259`	`258`	`}`
`260`	`259`	`}`
`261`		`- */`
`262`	`260`	`stage('Stash') {`
`263`	`261`	`steps {`
`264`	`262`	`dir('build_rel') {`