From d23868c69cd7c3022e96846481195d7232aa04e0 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 4 Jul 2023 22:28:45 +0200 Subject: [PATCH] fix(ci): properly create Quarkus platform & operator-sdk plugin PRs --- .github/workflows/release.yml | 20 ++++++++++-- .github/workflows/test.yml | 57 ----------------------------------- 2 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f83f96a4..e73eb2249 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,10 +76,11 @@ jobs: - name: Update QOSDK version to ${{steps.metadata.outputs.current-version}} in java-operator-plugins run: | cd sdk-plugins - sed -i '' -e 's|.*|${{steps.metadata.outputs.current-version}}|' pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go + sed -i -e 's|.*|${{steps.metadata.outputs.current-version}}|' $(pwd)/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go - name: Create java-operator-plugins pull request uses: peter-evans/create-pull-request@v5 + id: jop-pr with: path: sdk-plugins title: "feat: update QOSDK to ${{steps.metadata.outputs.current-version}}" @@ -89,9 +90,17 @@ jobs: branch: qosdk-release-${{steps.metadata.outputs.current-version}} token: ${{ secrets.QOSDK_BOT_TOKEN }} push-to-fork: qosdk-bot/java-operator-plugins + delete-branch: true + + - name: Check java-operator-plugins PR + if: ${{ steps.jop-pr.outputs.pull-request-number }} + run: | + echo "Pull Request Number - ${{ steps.jop-pr.outputs.pull-request-number }}" + echo "Pull Request URL - ${{ steps.jop-pr.outputs.pull-request-url }}" - name: Create quarkus-platform pull request uses: peter-evans/create-pull-request@v5 + id: qp-pr with: path: quarkus-platform title: "Update QOSDK to ${{steps.metadata.outputs.current-version}}" @@ -100,4 +109,11 @@ jobs: author: metacosm branch: qosdk-release-${{steps.metadata.outputs.current-version}} token: ${{ secrets.QOSDK_BOT_TOKEN }} - push-to-fork: qosdk-bot/quarkus-platform \ No newline at end of file + push-to-fork: qosdk-bot/quarkus-platform + delete-branch: true + + - name: Check quarkus-platform PR + if: ${{ steps.qp-pr.outputs.pull-request-number }} + run: | + echo "Pull Request Number - ${{ steps.qp-pr.outputs.pull-request-number }}" + echo "Pull Request URL - ${{ steps.qp-pr.outputs.pull-request-url }}" \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 78015c893..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,57 +0,0 @@ -on: workflow_dispatch -jobs: - test: - runs-on: ubuntu-latest - name: test - steps: - - uses: radcortez/project-metadata-action@main - name: Retrieve project metadata - id: metadata - with: - github-token: ${{secrets.GITHUB_TOKEN}} - metadata-file-path: '.github/project.yml' - - - uses: actions/checkout@v3 - with: - repository: quarkusio/quarkus-platform - path: quarkus-platform - - - name: Update QOSDK version to ${{steps.metadata.outputs.current-version}} in quarkus-platform - run: | - cd quarkus-platform - mvn -B versions:set-property -Dproperty=quarkus-operator-sdk.version -DnewVersion=${{steps.metadata.outputs.current-version}} - ./mvnw -Dsync - - - uses: actions/checkout@v3 - with: - repository: operator-framework/java-operator-plugins - path: sdk-plugins - - - name: Update QOSDK version to ${{steps.metadata.outputs.current-version}} in java-operator-plugins - run: | - cd sdk-plugins - sed -i '' -e 's|.*|${{steps.metadata.outputs.current-version}}|' pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go - - - name: Create java-operator-plugins pull request - uses: peter-evans/create-pull-request@v5 - with: - path: sdk-plugins - title: "feat: update QOSDK to ${{steps.metadata.outputs.current-version}}" - commit-message: "feat: update QOSDK to ${{steps.metadata.outputs.current-version}}" - committer: metacosm - author: metacosm - branch: qosdk-release-${{steps.metadata.outputs.current-version}} - token: ${{ secrets.QOSDK_BOT_TOKEN }} - push-to-fork: qosdk-bot/java-operator-plugins - - - name: Create quarkus-platform pull request - uses: peter-evans/create-pull-request@v5 - with: - path: quarkus-platform - title: "Update QOSDK to ${{steps.metadata.outputs.current-version}}" - commit-message: "Update QOSDK to ${{steps.metadata.outputs.current-version}}" - committer: metacosm - author: metacosm - branch: qosdk-release-${{steps.metadata.outputs.current-version}} - token: ${{ secrets.QOSDK_BOT_TOKEN }} - push-to-fork: qosdk-bot/quarkus-platform \ No newline at end of file