From b5c9539f16de5b8647418fc467c6ca8fd5c8d22c Mon Sep 17 00:00:00 2001 From: Kornel Date: Mon, 22 Feb 2021 09:46:32 +0000 Subject: [PATCH] Fight SPM retagging --- Configurations/make-release-package.sh | 2 +- Package.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Configurations/make-release-package.sh b/Configurations/make-release-package.sh index 4eb3372c66..2adc96dc4f 100755 --- a/Configurations/make-release-package.sh +++ b/Configurations/make-release-package.sh @@ -57,7 +57,7 @@ if [ "$ACTION" = "" ] ; then if [ "$CI" != true ]; then # Get latest git tag cd "$SRCROOT" - latest_git_tag=$(git describe --abbrev=0) + latest_git_tag=$(git describe --tags --abbrev=0) # Check semantic versioning if [[ $latest_git_tag =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]]; then echo "Tag $latest_git_tag follows semantic versioning" diff --git a/Package.swift b/Package.swift index 6bea977d52..1ea547e612 100644 --- a/Package.swift +++ b/Package.swift @@ -2,10 +2,10 @@ import PackageDescription // Version is technically not required here, SPM doesn't check -let version = "1.26.0" +let version = "1.26.0-a1" // Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it. -let tag = "1.26.0" -let checksum = "14f3a80c528d6ac5d6beff7ffda7e0ef6be83591d66cdd006fe55520fc6bbbf9" +let tag = "1.26.0-a1" +let checksum = "6995034093f9ab039a4249c331a432700ea64b90e11f2d88d36585a6df42c95c" let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip" let package = Package(