Skip to content

Commit

Permalink
4.2.0 release preparation. (#716)
Browse files Browse the repository at this point in the history
* Create 4.2.0 release notes.

* Fix in build_linux.sh: don't decorate BUILD_DIR when env var is set.

* Upload assets via release script to workaround jammy dpl issue.

* Use arm64 package name on all platforms.

* On Windows do not run ktx2check pipe test that fails with
  Git for Windows v2.41.0.windows.1.
  • Loading branch information
MarkCallow authored Jun 12, 2023
1 parent e405097 commit c6568b7
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 330 deletions.
59 changes: 30 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,38 +340,39 @@ deploy:
# #branch: master
# condition: $PACKAGE = YES
# ----------------------- dpl v1 -------------------------
- provider: releases
token: $GITHUB_TOKEN # Set in the repo settings page as a secure variable
name: $TRAVIS_TAG
skip_cleanup: true
# We can't use
#body: $RELNOTES
# because a bug in v1's backing Ruby code does not allow passing it
# command line option arguments that contain newlines leading to an
# error on Travis when we try.
# See https://github.com/travis-ci/dpl/issues/155.
#
# The obvious workarounds of literal "\n" or "<br />" do not work.
# The text is passed to GitHub but "\n" is shown literally. While "<br />"
# causes a newline in the rendering, the markdown interpreter does not
# recognize it as an actual newline so never changes the format from
# the initial heading format.
#
# Since we can't use either this or v2 to deply the release notes, we've
# rolled our own provider script for the body.
file_glob: true
file:
- $BUILD_DIR/KTX-Software-*-*
draft: true
prerelease: true
on:
tags: true
#branch: master
condition: $PACKAGE = "YES" && $TRAVIS_TAG =~ ^v[0-9].*
##### Not working on jammy runners at present. Do everything via our script.
# - provider: releases
# token: $GITHUB_TOKEN # Set in the repo settings page as a secure variable
# name: $TRAVIS_TAG
# skip_cleanup: true
# # We can't use
# #body: $RELNOTES
# # because a bug in v1's backing Ruby code does not allow passing it
# # command line option arguments that contain newlines leading to an
# # error on Travis when we try.
# # See https://github.com/travis-ci/dpl/issues/155.
# #
# # The obvious workarounds of literal "\n" or "<br />" do not work.
# # The text is passed to GitHub but "\n" is shown literally. While "<br />"
# # causes a newline in the rendering, the markdown interpreter does not
# # recognize it as an actual newline so never changes the format from
# # the initial heading format.
# #
# # Since we can't use either this or v2 to deply the release notes, we've
# # rolled our own provider script for the body.
# file_glob: true
# file:
# - $BUILD_DIR/KTX-Software-*-*
# draft: true
# prerelease: true
# on:
# tags: true
# #branch: master
# condition: $PACKAGE = "YES" && $TRAVIS_TAG =~ ^v[0-9].*

- provider: script
edge: true
script: ruby ci_scripts/github_release.rb -s ${GITHUB_TOKEN} -r ${TRAVIS_REPO_SLUG} -c $REL_DESC_FILE -t ${TRAVIS_TAG} --draft true --prerelease true
script: ruby ci_scripts/github_release.rb -s ${GITHUB_TOKEN} -r ${TRAVIS_REPO_SLUG} -c $REL_DESC_FILE -t ${TRAVIS_TAG} --overwrite true --draft true --prerelease true $BUILD_DIR/KTX-Software-*-*
on:
tags: true
#branch: master
Expand Down
15 changes: 10 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1068,15 +1068,20 @@ if( APPLE AND CMAKE_OSX_ARCHITECTURES )
else()
set(processor_name ${arch0})
endif()
elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID)
elseif( CMAKE_CXX_COMPILER_ARCHITECTURE_ID )
# When targeting Windows arm64 CMAKE_SYSTEM_PROCESSOR will incorrectly
# return AMD64.
# See: https://gitlab.kitware.com/cmake/cmake/-/issues/15170
# return AMD64. See: https://gitlab.kitware.com/cmake/cmake/-/issues/15170.
# We assume that when building for Windows arm64 that we are using MSVC
# so we can detect the processor arch name with CMAKE_CXX_COMPILER_ARCHITECTURE_ID
# or ClangCL so we can detect the processor arch name with
# CMAKE_CXX_COMPILER_ARCHITECTURE_ID
set(processor_name ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID})
elseif( CMAKE_SYSTEM_PROCESSOR )
set(processor_name ${CMAKE_SYSTEM_PROCESSOR})
if( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64" )
# Use consistent package name for all platforms.
set(processor_name "arm64")
else()
set(processor_name ${CMAKE_SYSTEM_PROCESSOR})
endif()
elseif( IOS )
# CMAKE_SYSTEM_PROCESSOR not set when building for iOS.
set(processor_name "arm64")
Expand Down
Loading

0 comments on commit c6568b7

Please sign in to comment.