build: Fix canary/nightly scripts. (#1479)

* Fix canary script. * Force canary. * Update workflow.
moonrepo · May 27, 2024 · d6611e4 · d6611e4
1 parent 09f3944
commit d6611e4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,6 +38,7 @@ jobs:
         env:
           CANARY: ${{ github.event_name == 'push' && contains(github.ref, 'develop-') }}
           NIGHTLY: ${{ github.event_name == 'schedule' }}
+          # CANARY: true
 
   build:
     strategy:
@@ -69,20 +70,20 @@ jobs:
             docker-platform: linux/arm64
 
           - target: x86_64-apple-darwin
-            host: macos-11
+            host: macos-12
             binary: moon
-            setup: |
-              export MACOSX_DEPLOYMENT_TARGET="10.13";
+            # setup: |
+            #   export MACOSX_DEPLOYMENT_TARGET="10.13";
 
           - target: aarch64-apple-darwin
-            host: macos-11
+            host: macos-12
             binary: moon
-            setup: |
-              export CC=$(xcrun -f clang);
-              export CXX=$(xcrun -f clang++);
-              export SDKROOT=$(xcrun -sdk macosx --show-sdk-path);
-              export CFLAGS="-isysroot $SDKROOT -isystem $SDKROOT";
-              export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version);
+            # setup: |
+            #   export CC=$(xcrun -f clang);
+            #   export CXX=$(xcrun -f clang++);
+            #   export SDKROOT=$(xcrun -sdk macosx --show-sdk-path);
+            #   export CFLAGS="-isysroot $SDKROOT -isystem $SDKROOT";
+            #   export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version);
 
           - target: x86_64-pc-windows-msvc
             host: windows-2022
@@ -168,7 +169,7 @@ jobs:
             setup: yarn config set supportedArchitectures.libc "musl"
 
           - target: x86_64-apple-darwin
-            host: macos-11
+            host: macos-12
 
           - target: aarch64-apple-darwin
             host: macos-14

diff --git a/nextgen/action/src/operation_meta.rs b/nextgen/action/src/operation_meta.rs
@@ -20,10 +20,10 @@ pub struct OperationMetaOutput {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub exit_code: Option<i32>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip)]
     pub stderr: Option<Arc<String>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip)]
     pub stdout: Option<Arc<String>>,
 }
 

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -31,6 +31,8 @@
   - Slightly tweaked our current UI rendering. You may notice some differences.
 - Updated external configuration files (via http extends) to be cached for 24 hours.
   - This will fix issues with offline mode.
+- Greatly reduced the amount of concurrent locks being held during task execution. May see slight
+  performance improvements.
 
 #### 🐞 Fixes
 
@@ -41,9 +43,8 @@
 
 #### ⚙️ Internal
 
-- Greatly reduced the amount of concurrent locks being held during task execution. May see slight
-  performance improvements.
 - Updated proto to v0.35.3 (from v0.34.4).
+- Updated macOS binaries to be built on macos-12 instead of macos-11.
 
 ## 1.24.6
 

diff --git a/scripts/release/setupNpm.sh b/scripts/release/setupNpm.sh
@@ -28,15 +28,17 @@ if [[ "$NPM_CHANNEL" == "canary" || "$NPM_CHANNEL" == "nightly" ]]; then
 			baseVersion=$(jq -r ".version" package.json)
 			version="$baseVersion$preid"
 
-			pkg=$(jq ".version += \"$preid\"" package.json)
-			echo "${pkg//^$baseVersion/$version}" > package.json
+			echo "${pkg//$baseVersion/$version}" > package.json
 
 		# For core packages, append the preid to the version
 		else
 			pkg=$(jq ".version += \"$preid\"" package.json)
 			echo "$pkg" > package.json
 		fi
 
+		# Print it out so we can debug it
+		echo $(cat package.json)
+
 		cd ../..
 	done
 fi