fix: paths to build-tools

btfuse · Oct 6, 2024 · 0094bb8 · 0094bb8
1 parent 8b7ac6e
commit 0094bb8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/android/makeRelease.sh b/android/makeRelease.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source ./build-tools/assertions.sh
+source ../build-tools/assertions.sh
 
 # TODO Remove mac requirement
 assertMac "Mac is required for publishing"
@@ -38,12 +38,12 @@ assertLastCall
 git add VERSION
 git commit -m "Android Release: $VERSION"
 git push
-git tag -a $VERSION -m "Android Release: $VERSION"
+git tag -a fuse-android/core/$VERSION -m "Android Release: $VERSION"
 git push --tags
 
 ./gradlew publishReleasePublicationToMavenRepository
 
-gh release create $VERSION \
+gh release create android/core/$VERSION \
     ./fuse/build/outputs/aar/fuse-debug.aar \
     ./fuse/build/outputs/aar/fuse-release.aar \
     --verify-tag --generate-notes
diff --git a/android/test.sh b/android/test.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source build-tools/assertions.sh
+source ../build-tools/assertions.sh
 
 target="$1"
 

diff --git a/ios/build.sh b/ios/build.sh
@@ -26,9 +26,9 @@
 #   2.  Run tests, this may take awhile.
 #   3.  Copy files to a dist/ directory.
 
-source build-tools/assertions.sh
-source build-tools/DirectoryTools.sh
-source build-tools/Checksum.sh
+source ../build-tools/assertions.sh
+source ../build-tools/DirectoryTools.sh
+source ../build-tools/Checksum.sh
 
 assertMac "Mac is required to build Fuse iOS"
 

diff --git a/ios/makeRelease.sh b/ios/makeRelease.sh
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source build-tools/assertions.sh
-source build-tools/DirectoryTools.sh
+source ../build-tools/assertions.sh
+source ../build-tools/DirectoryTools.sh
 
 assertMac "Mac is required for publishing"
 assertGitRepo
@@ -41,10 +41,10 @@ git add VERSION BTFuse/configs/version.xcconfig
 git add VERSION
 git commit -m "iOS Release: $VERSION"
 git push
-git tag -a $VERSION -m "iOS Release: $VERSION"
+git tag -a ios/core/$VERSION -m "iOS Release: $VERSION"
 git push --tags
 
-gh release create $VERSION \
+gh release create ios/core/$VERSION \
     ./dist/BTFuse.xcframework.zip \
     ./dist/BTFuse.xcframework.zip.sha1.txt \
     ./dist/BTFuse.framework.dSYM.zip \

diff --git a/ios/podPublish.sh b/ios/podPublish.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source build-tools/assertions.sh
+source ../build-tools/assertions.sh
 
 pod spec lint BTFuse.podspec
 assertLastCall

diff --git a/ios/test.sh b/ios/test.sh
@@ -16,9 +16,9 @@
 
 if [ -z "$1" ]; then
     # Default Tests
-    IOS_15=$(python3 ./build-tools/iossim.py "Fuse iOS 15" "iOS 15.5" "iPhone 13")
-    IOS_16=$(python3 ./build-tools/iossim.py "Fuse iOS 16" "iOS 16.4" "iPhone 14")
-    IOS_17=$(python3 ./build-tools/iossim.py "Fuse iOS 17" "iOS 17.5" "iPhone 15")
+    IOS_15=$(python3 ../build-tools/iossim.py "Fuse iOS 15" "iOS 15.5" "iPhone 13")
+    IOS_16=$(python3 ../build-tools/iossim.py "Fuse iOS 16" "iOS 16.4" "iPhone 14")
+    IOS_17=$(python3 ../build-tools/iossim.py "Fuse iOS 17" "iOS 17.5" "iPhone 15")
 
     xcrun simctl boot $IOS_15 > /dev/null
     xcrun simctl boot $IOS_16 > /dev/null
@@ -65,7 +65,7 @@ else
     SIM_VERSION="iOS $2"
     SIM_MODEL="$3"
 
-    SIM=$(python3 ./build-tools/iossim.py "$SIM_NAME" "$SIM_VERSION" "$SIM_MODEL")
+    SIM=$(python3 ../build-tools/iossim.py "$SIM_NAME" "$SIM_VERSION" "$SIM_MODEL")
     echo "Using Sim: $SIM"
 
     xcrun simctl boot $SIM > /dev/null

diff --git a/js/makeRelease.sh b/js/makeRelease.sh
@@ -0,0 +1,2 @@
+
+# TODO Needs to control the tagging process, using NPM flags.