diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53d1c12..b2ae4d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,9 +223,12 @@ jobs: git push origin - name: pull-request - uses: repo-sync/pull-request@v2 - with: - destination_branch: "develop" - pr_title: "Sync back" - pr_body: "An automated PR to sync changes back" - + env: + GH_TOKEN: ${{ github.token }} + run: | + gh_pr_up() { + gh pr create "$@" || gh pr edit "$@" + } + gh_pr_up -B "develop" \ + --title "Sync back" \ + --body "An automated PR to sync changes back" diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index fc7a684..1d02b30 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -81,12 +81,14 @@ jobs: echo "abort=0" >> $GITHUB_OUTPUT - name: pull-request - uses: repo-sync/pull-request@v2 if: steps.main.outputs.abort == 0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - source_branch: ${{ env.UPDATE_BRANCH }} - destination_branch: ${{ steps.main.outputs.current_branch }} - pr_title: "Update from template" - pr_body: "An automated PR to sync changes from the template into this repo" - + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh_pr_up() { + gh pr create "$@" || gh pr edit "$@" + } + gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ + -H "${{ env.UPDATE_BRANCH }}" \ + --title "Update from template" \ + --body "An automated PR to sync changes from the template into this repo" diff --git a/openapi-client-maven-template/pom.xml b/openapi-client-maven-template/pom.xml index 69b0ea2..1d7d4d8 100644 --- a/openapi-client-maven-template/pom.xml +++ b/openapi-client-maven-template/pom.xml @@ -148,7 +148,7 @@ com.mycila license-maven-plugin - 4.2 + 4.3 ${project.organization.url} @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs @@ -328,7 +328,7 @@ org.openapitools openapi-generator-maven-plugin - 7.0.0 + 7.0.1