diff --git a/.github/workflows/update_testing.yml b/.github/workflows/update_master.yml similarity index 50% rename from .github/workflows/update_testing.yml rename to .github/workflows/update_master.yml index a558011..a289a45 100644 --- a/.github/workflows/update_testing.yml +++ b/.github/workflows/update_master.yml @@ -1,26 +1,26 @@ -name: Create testing promotion pull request +name: Create master promotion pull request on: # Allow to manually trigger the workflow workflow_dispatch: - # Run it when when someone pushes to master + # Run it when when someone pushes to testing push: branches: - - master + - testing jobs: - testingPromotion: + masterPromotion: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: - ref: testing + ref: master - name: Reset promotion branch run: | - git fetch origin master:master - git reset --hard master + git fetch origin testing:testing + git reset --hard testing - name: Create Pull Request uses: peter-evans/create-pull-request@v5 with: - branch: testing-promotion - title: 'Upgrade testing from master' + branch: master-promotion + title: 'Upgrade master from testing' body: | - Upgrade testing from master + Upgrade master from testing diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 66764ab..828ad05 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -41,11 +41,11 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update master to version ${{ env.VERSION }} + commit-message: Update to version ${{ env.VERSION }} committer: 'yunohost-bot ' author: 'yunohost-bot ' signoff: false - base: master + base: testing branch: ci-auto-update-v${{ env.VERSION }} delete-branch: true title: 'Upgrade to version ${{ env.VERSION }}'