From 56961be55f66cc547333f90e264d23dcce77d6d2 Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Wed, 26 Oct 2022 15:52:38 +0200 Subject: [PATCH 1/2] fix: automation --- scripts/release/module-automation/commons.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release/module-automation/commons.js b/scripts/release/module-automation/commons.js index 2545af9df..9b9493802 100644 --- a/scripts/release/module-automation/commons.js +++ b/scripts/release/module-automation/commons.js @@ -155,7 +155,7 @@ async function commitAndCreatePullRequest(moduleInfo) { `git checkout -b ${changelogBranchName} && git add . && git commit -m "chore(${moduleInfo.nameWithDash}): update changelogs" && git push --set-upstream origin ${changelogBranchName}` ); await execShellCommand( - `gh pr create --title "${moduleInfo.nameWithSpace}: Updating changelogs" --body "This is an automated PR." --base master --head ${changelogBranchName}` + `gh pr create --title "${moduleInfo.nameWithSpace}: Updating changelogs" --body "This is an automated PR." --base main --head ${changelogBranchName}` ); console.log("Created PR for changelog updates."); } From 6fe267d84434071499ea913f5caf1d8c7cead308 Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Wed, 26 Oct 2022 16:05:30 +0200 Subject: [PATCH 2/2] fix: since in automation --- .github/workflows/Build.yml | 4 ++-- .github/workflows/NativeAutomatedTestsAndroid.yml | 4 ++-- .github/workflows/Release.yml | 4 ++-- .github/workflows/UnitTests.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index d5ddc7137..cec4abcb2 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -35,11 +35,11 @@ jobs: - name: "Defining environment variables" if: startsWith(matrix.os, 'ubuntu') id: variablesLinux - run: echo "::set-output name=arg::$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '--since origin/${{ github.base_ref }}'; else echo ''; fi)" + run: echo "::set-output name=arg::$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '--since'; else echo ''; fi)" - name: "Defining environment variables" if: startsWith(matrix.os, 'windows') id: variablesWindows - run: echo "::set-output name=arg::$(If ('${{ steps.files.outputs.global_files }}' -eq '' -AND '${{ github.event_name == 'pull_request' }}' -eq 'true'){ echo '--since origin/${{ github.base_ref }}' } Else { echo '' })" + run: echo "::set-output name=arg::$(If ('${{ steps.files.outputs.global_files }}' -eq '' -AND '${{ github.event_name == 'pull_request' }}' -eq 'true'){ echo '--since' } Else { echo '' })" - name: "Defining node version" uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561 # v2 with: diff --git a/.github/workflows/NativeAutomatedTestsAndroid.yml b/.github/workflows/NativeAutomatedTestsAndroid.yml index 98002fe53..e2ccea15c 100644 --- a/.github/workflows/NativeAutomatedTestsAndroid.yml +++ b/.github/workflows/NativeAutomatedTestsAndroid.yml @@ -43,7 +43,7 @@ jobs: # id: variables # run: # echo ::set-output name=arg::$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ - # github.event_name == 'pull_request' }}; then echo '--since origin/${{ github.base_ref }}'; else echo + # github.event_name == 'pull_request' }}; then echo '--since'; else echo # ''; fi) - name: "Get yarn cache directory path" id: yarn-cache-dir-path @@ -74,7 +74,7 @@ jobs: # if: # github.event_name == 'push' || (github.event_name == 'pull_request' && # github.event.pull_request.head.repo.full_name != github.repository) - # run: yarn test:e2e -- --since origin/${{ github.base_ref }} + # run: yarn test:e2e -- --since # env: # FORKED: # github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 925d1d4d3..429c4610b 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -35,11 +35,11 @@ jobs: - name: "Defining environment variables" if: startsWith(matrix.os, 'ubuntu') id: variablesLinux - run: echo "::set-output name=arg::$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '--since origin/${{ github.base_ref }}'; else echo ''; fi)" + run: echo "::set-output name=arg::$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '--since'; else echo ''; fi)" - name: "Defining environment variables" if: startsWith(matrix.os, 'windows') id: variablesWindows - run: echo "::set-output name=arg::$(If ('${{ steps.files.outputs.global_files }}' -eq '' -AND '${{ github.event_name == 'pull_request' }}' -eq 'true'){ echo '--since origin/${{ github.base_ref }}' } Else { echo '' })" + run: echo "::set-output name=arg::$(If ('${{ steps.files.outputs.global_files }}' -eq '' -AND '${{ github.event_name == 'pull_request' }}' -eq 'true'){ echo '--since' } Else { echo '' })" - name: "Defining node version" uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561 # v2 with: diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml index 5f407e0fa..aa4f5a52c 100644 --- a/.github/workflows/UnitTests.yml +++ b/.github/workflows/UnitTests.yml @@ -31,7 +31,7 @@ jobs: run: git fetch --no-tags --prune --depth=1 origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }} - name: "Defining environment variables" id: variables - run: echo "::set-output name=arg::$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '--since origin/${{ github.base_ref }}'; else echo ''; fi)" + run: echo "::set-output name=arg::$(if [ "${{ steps.files.outputs.global_files }}" = "" ] && ${{ github.event_name == 'pull_request' }}; then echo '--since'; else echo ''; fi)" - name: "Defining node version" uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561 # v2 with: