Skip to content

Commit

Permalink
Performed additional Carthage cleanup, and discovered that 'carthage …
Browse files Browse the repository at this point in the history
…archive' doesn't work with the --use-xcframeworks option on the build command (Carthage issue 3130) [ci skip]
  • Loading branch information
abbeycode committed Feb 17, 2022
1 parent 1d88ca4 commit cd705d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Scripts/archive-carthage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set -ev

# Archives the Carthage packages, and prints the name of the archive

# Employing a workaround until Xcode 12 builds are fixed
SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
source "${SCRIPTPATH}"/carthage.sh build --no-skip-current
source "${SCRIPTPATH}"/carthage.sh archive
carthage build --use-xcframeworks --no-skip-current

export ARCHIVE_PATH="UnrarKit.framework.zip"
# This is currently broken, combined with the --use-xcframeworks option above, as of Carthage 0.38.0 on 2/17/2021
carthage archive

export ARCHIVE_PATH="UnrarKit.xcframework.zip"
3 changes: 0 additions & 3 deletions Scripts/carthage-validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ carthage --version
REPO="github \"$TRAVIS_REPO_SLUG\""
COMMIT=$TRAVIS_COMMIT

# Only necessary for workaround below
SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"

if [ -z ${TRAVIS+x} ]; then
REPO="git \"`pwd`\""
COMMIT=`git log -1 --oneline | cut -f1 -d' '`
Expand Down

0 comments on commit cd705d5

Please sign in to comment.