fix(CI): update check version scripts

socketsupply · May 18, 2023 · ec543b9 · ec543b9
1 parent 7dd72c5
commit ec543b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/bin/ci_version_check.ps1 b/bin/ci_version_check.ps1
@@ -5,7 +5,7 @@ if ($env:Path -notlike "*$BIN_PATH*") {
   $env:Path = $new_path
 }
 
-$VERSION_SSC = $(ssc -v) 2>&1 | % ToString
+$VERSION_SSC = $(ssc -v 2>&1 | Select-Object -First 1) | % ToString
 $VERSION_TXT = $(type VERSION.txt) 2>&1 | % ToString
 $VERSION_GIT = $(git rev-parse --short=8 HEAD) 2>&1 | % ToString
 $VERSION_EXPECTED = "$VERSION_TXT ($VERSION_GIT)"

diff --git a/bin/ci_version_check.sh b/bin/ci_version_check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION_SSC=$(ssc -v)
+VERSION_SSC=$(ssc -v | head -n 1)
 
 VERSION_TXT=$(cat VERSION.txt)
 VERSION_GIT=$(git rev-parse --short=8 HEAD)

diff --git a/bin/install.sh b/bin/install.sh
@@ -317,7 +317,7 @@ function _build_runtime_library() {
     "$root/bin/build-runtime-library.sh" --arch "$arch" --platform ios $pass_force $pass_ignore_header_mtimes & pids+=($!)
     "$root/bin/build-runtime-library.sh" --arch x86_64 --platform ios-simulator $pass_force $pass_ignore_header_mtimes & pids+=($!)
     if [[ "$arch" = "arm64" ]] && [[ -z "$NO_IOS" ]]; then
-      "$root/bin/build-runtime-library.sh" --arch "$arch" --platform ios-simulator $pass_force $pass_ignore_header_mtimes & pids+=($!)    
+      "$root/bin/build-runtime-library.sh" --arch "$arch" --platform ios-simulator $pass_force $pass_ignore_header_mtimes & pids+=($!)
     fi
   fi
 
@@ -418,7 +418,7 @@ function _prebuild_ios_main () {
 
   local clang="$(xcrun -sdk iphoneos -find clang++)"
   local cflags=($(TARGET_OS_IPHONE=1 "$root/bin/cflags.sh"))
-  local test_sources=($(find "$src"/ios/ios.mm 2>/dev/null))
+  local test_sources=($(find "$src"/ios/main.mm 2>/dev/null))
   local sources=()
   local outputs=()
 
@@ -454,7 +454,7 @@ function _prebuild_ios_simulator_main () {
 
   local clang="$(xcrun -sdk iphonesimulator -find clang++)"
   local cflags=($(TARGET_IPHONE_SIMULATOR=1 ARCH="$arch" $root/bin/cflags.sh))
-  local test_sources=($(find "$src"/ios/ios.mm 2>/dev/null))
+  local test_sources=($(find "$src"/ios/main.mm 2>/dev/null))
   local sources=()
   local outputs=()
 
@@ -672,7 +672,7 @@ function _compile_libuv_android {
   local cflags=("$clang_target" -std=gnu89 -g -pedantic -I"$root"/build/uv/include -I"$root"/build/uv/src -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_LARGEFILE_SOURCE -fPIC -Wall -Wextra -Wno-pedantic -Wno-sign-compare -Wno-unused-parameter -Wno-implicit-function-declaration)
   cflags+=("${android_includes[*]}")
   local objects=()
-  local sources=("unix/async.c" "unix/core.c" "unix/dl.c" "unix/fs.c" "unix/getaddrinfo.c" "unix/getnameinfo.c" "unix/linux.c" "unix/loop.c" "unix/loop-watcher.c" "unix/pipe.c" "unix/poll.c" "unix/process.c" "unix/proctitle.c" "unix/random-devurandom.c" "unix/random-getentropy.c" "unix/random-getrandom.c" "unix/random-sysctl-linux.c" "unix/signal.c" "unix/stream.c" "unix/tcp.c" "unix/thread.c" "unix/tty.c" "unix/udp.c" fs-poll.c idna.c inet.c random.c strscpy.c strtok.c threadpool.c timer.c uv-common.c uv-data-getter-setters.c version.c)  
+  local sources=("unix/async.c" "unix/core.c" "unix/dl.c" "unix/fs.c" "unix/getaddrinfo.c" "unix/getnameinfo.c" "unix/linux.c" "unix/loop.c" "unix/loop-watcher.c" "unix/pipe.c" "unix/poll.c" "unix/process.c" "unix/proctitle.c" "unix/random-devurandom.c" "unix/random-getentropy.c" "unix/random-getrandom.c" "unix/random-sysctl-linux.c" "unix/signal.c" "unix/stream.c" "unix/tcp.c" "unix/thread.c" "unix/tty.c" "unix/udp.c" fs-poll.c idna.c inet.c random.c strscpy.c strtok.c threadpool.c timer.c uv-common.c uv-data-getter-setters.c version.c)
 
   declare output_directory="$root/build/$arch-$platform/uv$d"
   mkdir -p "$output_directory"
@@ -912,7 +912,7 @@ if [[ "$(uname -s)" == "Darwin" ]] && [[ -z "$NO_IOS" ]]; then
   _setSDKVersion iPhoneOS
 
   _compile_libuv arm64 iPhoneOS & pids+=($!)
-  _compile_libuv x86_64 iPhoneSimulator & pids+=($!)  
+  _compile_libuv x86_64 iPhoneSimulator & pids+=($!)
   if [[ "$arch" = "arm64" ]]; then
     _compile_libuv arm64 iPhoneSimulator & pids+=($!)
   fi

diff --git a/src/cli/templates.hh b/src/cli/templates.hh
@@ -139,7 +139,7 @@ constexpr auto gHelloWorld = R"HTML(
 <!doctype html>
 <html>
   <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
     <style type="text/css">
       html, body {
         height: 100%;
@@ -471,7 +471,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$!
 		17A7F8F229358D220051D146 /* init.cc in Sources */ = {isa = PBXBuildFile; fileRef = 17A7F8EE29358D180051D146 /* init.cc */; };
 		17A7F8F529358D430051D146 /* libsocket-runtime.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F329358D430051D146 /* libsocket-runtime.a */; };
 		17A7F8F629358D430051D146 /* libuv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F429358D430051D146 /* libuv.a */; };
-		17A7F8F729358D4D0051D146 /* ios.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F129358D180051D146 /* ios.o */; };
+		17A7F8F729358D4D0051D146 /* main.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F129358D180051D146 /* main.o */; };
 		17C230BA28E9398700301440 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C230B928E9398700301440 /* Foundation.framework */; };
 		290F7EBF2768C49000486988 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 294A3C792763E9C6007B5B9A /* UIKit.framework */; };
 		290F7F87276BC2B000486988 /* lib in Resources */ = {isa = PBXBuildFile; fileRef = 290F7F86276BC2B000486988 /* lib */; };
@@ -485,7 +485,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$!
 
 /* Begin PBXFileReference section */
 		17A7F8EE29358D180051D146 /* init.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = init.cc; sourceTree = "<group>"; };
-		17A7F8F129358D180051D146 /* ios.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ios.o; sourceTree = "<group>"; };
+		17A7F8F129358D180051D146 /* main.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = main.o; sourceTree = "<group>"; };
 		17A7F8F329358D430051D146 /* libsocket-runtime.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsocket-runtime.a"; path = "lib/libsocket-runtime.a"; sourceTree = "<group>"; };
 		17A7F8F429358D430051D146 /* libuv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libuv.a; path = lib/libuv.a; sourceTree = "<group>"; };
 		17C230B928E9398700301440 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -511,7 +511,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$!
 			files = (
 				17A7F8F529358D430051D146 /* libsocket-runtime.a in Frameworks */,
 				17A7F8F629358D430051D146 /* libuv.a in Frameworks */,
-				17A7F8F729358D4D0051D146 /* ios.o in Frameworks */,
+				17A7F8F729358D4D0051D146 /* main.o in Frameworks */,
 				17C230BA28E9398700301440 /* Foundation.framework in Frameworks */,
 				2996EDB22770BC1F00C672A2 /* Network.framework in Frameworks */,
 				2996EDB22770BC1F00C672A3 /* CoreBluetooth.framework in Frameworks */,
@@ -535,7 +535,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$!
 		17A7F8F029358D180051D146 /* ios */ = {
 			isa = PBXGroup;
 			children = (
-				17A7F8F129358D180051D146 /* ios.o */,
+				17A7F8F129358D180051D146 /* main.o */,
 			);
 			path = ios;
 			sourceTree = "<group>";