From 87a496fa3eb82f420c87532073216e12f4a21f9d Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Fri, 24 May 2024 21:07:38 -0700 Subject: [PATCH 1/3] Fix canary script. --- .github/workflows/release.yml | 24 ++++++++++++------------ scripts/release/setupNpm.sh | 6 +++++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b63cbe33b26..32ba57e0d69 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ on: schedule: - cron: '0 0 * * *' # Uncomment to test in PRs (its safe) - # pull_request: + pull_request: permissions: contents: write @@ -69,20 +69,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 +168,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/scripts/release/setupNpm.sh b/scripts/release/setupNpm.sh index 20df3b0c705..c69132dee6b 100644 --- a/scripts/release/setupNpm.sh +++ b/scripts/release/setupNpm.sh @@ -29,7 +29,8 @@ if [[ "$NPM_CHANNEL" == "canary" || "$NPM_CHANNEL" == "nightly" ]]; then 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 @@ -37,6 +38,9 @@ if [[ "$NPM_CHANNEL" == "canary" || "$NPM_CHANNEL" == "nightly" ]]; then echo "$pkg" > package.json fi + # Print it out so we can debug it + echo $(cat package.json) + cd ../.. done fi From 72d573b03461c62c224343914f3c7fb40e77b2d0 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Fri, 24 May 2024 21:25:13 -0700 Subject: [PATCH 2/3] Force canary. --- .github/workflows/release.yml | 10 ++++++---- packages/cli/CHANGELOG.md | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32ba57e0d69..6b01bf56048 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,16 +28,18 @@ jobs: runs-on: ubuntu-latest outputs: publish: - ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || - github.event_name == 'push' && contains(github.ref, 'develop-') }} + ${{ true }} + # ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || + # github.event_name == 'push' && contains(github.ref, 'develop-') }} npm-channel: ${{ steps.plan-step.outputs.npm-channel }} steps: - uses: actions/checkout@v4 - id: plan-step run: bash ./scripts/release/planRelease.sh env: - CANARY: ${{ github.event_name == 'push' && contains(github.ref, 'develop-') }} - NIGHTLY: ${{ github.event_name == 'schedule' }} + # CANARY: ${{ github.event_name == 'push' && contains(github.ref, 'develop-') }} + # NIGHTLY: ${{ github.event_name == 'schedule' }} + CANARY: true build: strategy: diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 87a5dedc544..21ad271284a 100644 --- 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 From 0dfaf2a8b2b721e4f896ed2cb78dab04378d46b0 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Fri, 24 May 2024 21:43:16 -0700 Subject: [PATCH 3/3] Update workflow. --- .github/workflows/release.yml | 13 ++++++------- nextgen/action/src/operation_meta.rs | 4 ++-- scripts/release/setupNpm.sh | 2 -- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b01bf56048..c62dabb7a3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ on: schedule: - cron: '0 0 * * *' # Uncomment to test in PRs (its safe) - pull_request: + # pull_request: permissions: contents: write @@ -28,18 +28,17 @@ jobs: runs-on: ubuntu-latest outputs: publish: - ${{ true }} - # ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || - # github.event_name == 'push' && contains(github.ref, 'develop-') }} + ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || + github.event_name == 'push' && contains(github.ref, 'develop-') }} npm-channel: ${{ steps.plan-step.outputs.npm-channel }} steps: - uses: actions/checkout@v4 - id: plan-step run: bash ./scripts/release/planRelease.sh env: - # CANARY: ${{ github.event_name == 'push' && contains(github.ref, 'develop-') }} - # NIGHTLY: ${{ github.event_name == 'schedule' }} - CANARY: true + CANARY: ${{ github.event_name == 'push' && contains(github.ref, 'develop-') }} + NIGHTLY: ${{ github.event_name == 'schedule' }} + # CANARY: true build: strategy: diff --git a/nextgen/action/src/operation_meta.rs b/nextgen/action/src/operation_meta.rs index 074e1b1e5f6..c982abcb88b 100644 --- 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, - #[serde(skip_serializing_if = "Option::is_none")] + #[serde(skip)] pub stderr: Option>, - #[serde(skip_serializing_if = "Option::is_none")] + #[serde(skip)] pub stdout: Option>, } diff --git a/scripts/release/setupNpm.sh b/scripts/release/setupNpm.sh index c69132dee6b..29e7f947f0f 100644 --- a/scripts/release/setupNpm.sh +++ b/scripts/release/setupNpm.sh @@ -28,10 +28,8 @@ 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 - # For core packages, append the preid to the version else pkg=$(jq ".version += \"$preid\"" package.json)