From c8bb18e00672c8a4d5e7de4121a7fe778f154202 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 25 Apr 2024 11:29:37 +0300 Subject: [PATCH 1/2] Update auto-pr for prerel-8.2 --- .github/workflows/auto-pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index e38c381c88..2b8343fa66 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch dev with rel-8.1 +name: Merge branch prerel-8.2 with rel-8.1 on: push: branches: @@ -7,7 +7,7 @@ permissions: contents: read jobs: - merge-dev-with-rel-8-1: + merge-prerel-8-2-with-rel-8-1: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: dev + ref: prerel-8.2 - name: Reset promotion branch run: | git fetch origin rel-8.1:rel-8.1 @@ -24,8 +24,8 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-8-1/${{github.run_number}} - title: Merge branch dev with rel-8.1 - body: This PR generated automatically to merge dev with rel-8.1. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch prerel-8.2 with rel-8.1 + body: This PR generated automatically to merge prerel-8.2 with rel-8.1. Please review the changed files before merging to prevent any errors that may occur. reviewers: maliming token: ${{ github.token }} - name: Merge Pull Request From 809e73356e8a33f81272c23659b849e59c62b316 Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Fri, 26 Apr 2024 15:19:27 +0300 Subject: [PATCH 2/2] fix: missing args for ng ps1 file --- npm/preview-publish.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/npm/preview-publish.ps1 b/npm/preview-publish.ps1 index bcf75ae3a6..c3f236c752 100644 --- a/npm/preview-publish.ps1 +++ b/npm/preview-publish.ps1 @@ -1,11 +1,12 @@ param( [string]$Version, - [string]$Registry - + [string]$Registry, + [string]$LeptonXVersion ) + $commands = ( ".\publish-mvc.ps1 $Version $Registry", - ".\publish-ng.ps1 $Version $Registry" + ".\publish-ng.ps1 $Version $Registry $LeptonXVersion" ); $NextVersion = $(node publish-utils.js --nextVersion)