From e08cac13413749b0cd57e506d90b11e17e04364f Mon Sep 17 00:00:00 2001 From: Kiryl Kovaliov Date: Mon, 29 Jul 2024 09:38:33 +0200 Subject: [PATCH] SP-17253 support develop -> stable -> master development approach --- .github/workflows/release-clients.yml | 33 --------------------------- .github/workflows/update-clients.yml | 33 +++++++++++++++++---------- .github/workflows/validate-spec.yml | 6 +++-- .github/workflows/verify-clients.yml | 2 ++ 4 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/release-clients.yml diff --git a/.github/workflows/release-clients.yml b/.github/workflows/release-clients.yml deleted file mode 100644 index bf098d3..0000000 --- a/.github/workflows/release-clients.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: release clients - -on: - workflow_dispatch: - inputs: - version: - description: "Version" - required: true - options: - description: "Possible options: --prerelease" - required: false - default: "" - -jobs: - - release-clients: - runs-on: ubuntu-latest - steps: - - name: Release clients - run: | - gh release create v${{github.event.inputs.version}} ${{github.event.inputs.options}} --title ${{github.event.inputs.version}} --repo regulaforensics/DocumentReader-web-js-client - gh release create v${{github.event.inputs.version}} ${{github.event.inputs.options}} --title ${{github.event.inputs.version}} --repo regulaforensics/DocumentReader-web-java-client - gh release create v${{github.event.inputs.version}} ${{github.event.inputs.options}} --title ${{github.event.inputs.version}} --repo regulaforensics/DocumentReader-web-python-client - gh release create v${{github.event.inputs.version}} ${{github.event.inputs.options}} --title ${{github.event.inputs.version}} --repo regulaforensics/DocumentReader-web-csharp-client - env: - GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} - - - name: Repository Dispatch - uses: peter-evans/repository-dispatch@v3 - with: - event-type: release-web-page - client-payload: '{"version": "${{github.event.inputs.version}}", "success": true}' - if: ${{ success() }} diff --git a/.github/workflows/update-clients.yml b/.github/workflows/update-clients.yml index 0eea313..50dabb9 100644 --- a/.github/workflows/update-clients.yml +++ b/.github/workflows/update-clients.yml @@ -13,15 +13,18 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Specification Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: 'DocumentReader-web-openapi' + ref: 'develop' - name: Checkout JS Client Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'regulaforensics/DocumentReader-web-js-client' token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} path: 'js-client' + ref: 'develop' + - name: Update Model According To Specification working-directory: js-client run: | @@ -36,7 +39,7 @@ jobs: git add --all git commit -m "${{ github.event.inputs.title }}" -a git push --set-upstream origin ${GITHUB_SHA::8} - gh pr create --fill --draft + gh pr create --fill --draft --base develop env: GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} @@ -49,15 +52,17 @@ jobs: java-version: 11 java-package: jdk - name: Checkout Specification Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: 'DocumentReader-web-openapi' + ref: 'develop' - name: Checkout Java Client Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'regulaforensics/DocumentReader-web-java-client' token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} path: 'java-client' + ref: 'develop' - name: Update Model According To Specification working-directory: java-client run: | @@ -71,7 +76,7 @@ jobs: git add --all git commit -m "${{ github.event.inputs.title }}" -a git push --set-upstream origin ${GITHUB_SHA::8} - gh pr create --fill --draft + gh pr create --fill --draft --base develop env: GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} @@ -79,15 +84,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Specification Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: 'DocumentReader-web-openapi' + ref: 'develop' - name: Checkout Python Client Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'regulaforensics/DocumentReader-web-python-client' token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} path: 'python-client' + ref: 'develop' - name: Update Model According To Specification working-directory: python-client run: | @@ -101,7 +108,7 @@ jobs: git add --all git commit -m "${{ github.event.inputs.title }}" -a git push --set-upstream origin ${GITHUB_SHA::8} - gh pr create --fill --draft + gh pr create --fill --draft --base develop env: GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} @@ -109,15 +116,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Specification Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: 'DocumentReader-web-openapi' + ref: 'develop' - name: Checkout C# Client Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'regulaforensics/DocumentReader-web-csharp-client' token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} path: 'csharp-client' + ref: 'develop' - name: Update Model According To Specification working-directory: csharp-client run: | @@ -132,6 +141,6 @@ jobs: git add --all git commit -m "${{ github.event.inputs.title }}" -a git push --set-upstream origin ${GITHUB_SHA::8} - gh pr create --fill --draft + gh pr create --fill --draft --base develop env: GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }} diff --git a/.github/workflows/validate-spec.yml b/.github/workflows/validate-spec.yml index 2e430b1..8fc552c 100644 --- a/.github/workflows/validate-spec.yml +++ b/.github/workflows/validate-spec.yml @@ -4,12 +4,14 @@ on: pull_request: branches: - master + - develop + - stable jobs: validate-specification: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@v1 with: node-version: 14 @@ -21,4 +23,4 @@ jobs: run: | npm install -g @openapitools/openapi-generator-cli openapi-generator-cli validate -i index.yml - + diff --git a/.github/workflows/verify-clients.yml b/.github/workflows/verify-clients.yml index b624143..8588717 100644 --- a/.github/workflows/verify-clients.yml +++ b/.github/workflows/verify-clients.yml @@ -4,6 +4,8 @@ on: pull_request: branches: - master + - develop + - stable jobs: verify-python: