diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 6e7e907e5326..37b72b0e346b 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -66,7 +66,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha || github.event.push.head.sha }} persist-credentials: false - fetch-depth: 0 - name: set git user run: | git config user.email "team-live@ledger.fr" @@ -109,7 +108,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha || github.event.push.head.sha }} persist-credentials: false - fetch-depth: 0 - name: set git user run: | git config user.email "team-live@ledger.fr" @@ -155,7 +153,6 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha || github.event.push.head.sha }} - fetch-depth: 0 - name: update path run: | echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append @@ -199,7 +196,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha || github.event.push.head.sha }} persist-credentials: false - fetch-depth: 0 - name: set git user run: | git config user.email "team-live@ledger.fr" diff --git a/.github/workflows/release-create-hotfix.yml b/.github/workflows/release-create-hotfix.yml index 54c96b956723..823a205b643e 100644 --- a/.github/workflows/release-create-hotfix.yml +++ b/.github/workflows/release-create-hotfix.yml @@ -12,7 +12,6 @@ jobs: - uses: actions/checkout@v3 with: ref: main - fetch-depth: 0 token: ${{ secrets.GH_PAT }} - name: set git user run: | diff --git a/.github/workflows/release-create.yml b/.github/workflows/release-create.yml index 4ba68950bd85..295e6708dd04 100644 --- a/.github/workflows/release-create.yml +++ b/.github/workflows/release-create.yml @@ -12,7 +12,6 @@ jobs: - uses: actions/checkout@v3 with: ref: develop - fetch-depth: 0 token: ${{ secrets.GH_PAT }} - name: set git user run: | diff --git a/.github/workflows/release-final.yml b/.github/workflows/release-final.yml index 90157f744c43..5ba1adbd0749 100644 --- a/.github/workflows/release-final.yml +++ b/.github/workflows/release-final.yml @@ -17,7 +17,6 @@ jobs: - uses: actions/checkout@v3 with: ref: main - fetch-depth: 0 token: ${{ secrets.GH_PAT }} - name: set git user run: | diff --git a/.github/workflows/release-prepare-desktop.yml b/.github/workflows/release-prepare-desktop.yml index 4e84e36b48ee..276159999d5c 100644 --- a/.github/workflows/release-prepare-desktop.yml +++ b/.github/workflows/release-prepare-desktop.yml @@ -19,7 +19,6 @@ jobs: uses: actions/checkout@v3 with: ref: ${{ github.event.inputs.ref }} - fetch-depth: 0 token: ${{ secrets.GH_PAT }} - name: set git user @@ -58,6 +57,10 @@ jobs: git push origin ${{ github.event.inputs.ref }} git fetch origin + - name: fetch develop and main + run: | + git fetch origin develop main + - name: merge into develop run: | git checkout develop diff --git a/.github/workflows/release-prepare-hotfix.yml b/.github/workflows/release-prepare-hotfix.yml index 729f2c5421ee..849c09cd1b49 100644 --- a/.github/workflows/release-prepare-hotfix.yml +++ b/.github/workflows/release-prepare-hotfix.yml @@ -19,7 +19,6 @@ jobs: uses: actions/checkout@v3 with: ref: ${{ github.event.inputs.ref }} - fetch-depth: 0 token: ${{ secrets.GH_PAT }} - name: set git user @@ -58,6 +57,10 @@ jobs: git push origin ${{ github.event.inputs.ref }} git fetch origin + - name: fetch develop and main + run: | + git fetch origin develop main + - name: merge into main run: | git checkout main diff --git a/.github/workflows/release-prepare-mobile.yml b/.github/workflows/release-prepare-mobile.yml index 755c82026bc3..cb0c211e6d6e 100644 --- a/.github/workflows/release-prepare-mobile.yml +++ b/.github/workflows/release-prepare-mobile.yml @@ -19,7 +19,6 @@ jobs: uses: actions/checkout@v3 with: ref: ${{ github.event.inputs.ref }} - fetch-depth: 0 token: ${{ secrets.GH_PAT }} - name: set git user run: |