-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #38 from reportportal/develop
Release
- Loading branch information
Showing
13 changed files
with
89 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| # Copyright 2021 EPAM Systems | ||
| # Copyright 2022 EPAM Systems | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # https://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
|
|
@@ -18,17 +18,17 @@ on: | |
| branches: | ||
| - master | ||
| paths-ignore: | ||
| - '.github/**' | ||
| - README.md | ||
| - README_TEMPLATE.md | ||
| - gradle.properties | ||
| - CHANGELOG.md | ||
|
|
||
| env: | ||
| VERSION_FILE: gradle.properties | ||
| VERSION_EXTRACT_PATTERN: '(?<=version=).+' | ||
| REPOSITORY_URL: 'https://maven.pkg.github.com/' | ||
| CHANGE_LOG_FILE: CHANGELOG.md | ||
| CHANGE_LOG_TMP_FILE: CHANGELOG_updated.md | ||
| REPOSITORY_URL: 'https://maven.pkg.github.com/' | ||
| README_FILE: README.md | ||
| README_TEMPLATE_FILE: README_TEMPLATE.md | ||
| README_VERSION_PLACEHOLDER: $LATEST_VERSION | ||
|
|
@@ -38,25 +38,23 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Generate versions | ||
| uses: HardNorth/github-version-generate@v1.1.1 | ||
| uses: HardNorth/github-version-generate@v1 | ||
| with: | ||
| version-source: file | ||
| version-file: ${{ env.VERSION_FILE }} | ||
| version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }} | ||
|
|
||
| - name: Set up JDK 1.8 | ||
| uses: actions/setup-java@v1 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 1.8 | ||
|
|
||
| - name: Grant execute permission for gradlew | ||
| run: chmod +x gradlew | ||
| distribution: 'temurin' | ||
| java-version: '8' | ||
|
|
||
| - name: Setup git credentials | ||
| uses: oleksiyrudenko/gha-git-credentials@v2 | ||
| uses: oleksiyrudenko/gha-git-credentials@v2.1.1 | ||
| with: | ||
| name: 'reportportal.io' | ||
| email: '[email protected]' | ||
|
|
@@ -68,16 +66,13 @@ jobs: | |
| ./gradlew release -Prelease.useAutomaticVersion=true -Prelease.releaseVersion=${{ env.RELEASE_VERSION }} \ | ||
| -Prelease.newVersion=${{ env.NEXT_VERSION }} -PpublishRepo=${{ env.REPOSITORY_URL }}${{ github.repository }} \ | ||
| -PgithubUserName=${{ github.actor }} -PgithubToken=${{ secrets.GITHUB_TOKEN }} \ | ||
| -PgpgPassphrase=${{ secrets.GPG_PASSPHRASE }} -PgpgPrivateKey="$(cat <<'EOF' | ||
| ${{ secrets.GPG_PRIVATE_KEY }} | ||
| EOF | ||
| )" | ||
| -PgpgPassphrase=${{ secrets.GPG_PASSPHRASE }} -PgpgPrivateKey="${{ secrets.GPG_PRIVATE_KEY }}" | ||
| - name: Update README.md | ||
| id: readmeUpdate | ||
| run: | | ||
| sed 's/${{env.README_VERSION_PLACEHOLDER}}/${{env.RELEASE_VERSION}}/g' ${{env.README_TEMPLATE_FILE}} > ${{env.README_FILE}} | ||
| git add ${{env.README_FILE}} | ||
| sed 's/${{ env.README_VERSION_PLACEHOLDER }}/${{ env.RELEASE_VERSION }}/g' ${{ env.README_TEMPLATE_FILE }} > ${{ env.README_FILE }} | ||
| git add ${{ env.README_FILE }} | ||
| git commit -m "Readme update" | ||
| - name: Update CHANGELOG.md | ||
|
|
@@ -96,35 +91,29 @@ jobs: | |
| - name: Read changelog Entry | ||
| id: readChangelogEntry | ||
| uses: mindsers/changelog-reader-action@v1.3.1 | ||
| uses: mindsers/changelog-reader-action@v2 | ||
| with: | ||
| version: ${{ env.RELEASE_VERSION }} | ||
| path: ./${{ env.CHANGE_LOG_FILE }} | ||
|
|
||
| - name: Create Release | ||
| id: createRelease | ||
| uses: actions/create-release@v1 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| uses: ncipollo/release-action@v1 | ||
| with: | ||
| tag_name: ${{ env.RELEASE_VERSION }} | ||
| release_name: Release ${{ env.RELEASE_VERSION }} | ||
| body: ${{ steps.readChangelogEntry.outputs.log_entry }} | ||
| draft: false | ||
| prerelease: false | ||
| tag: ${{ env.RELEASE_VERSION }} | ||
| name: Release ${{ env.RELEASE_VERSION }} | ||
| body: ${{ steps.readChangelogEntry.outputs.changes }} | ||
|
|
||
| - name: Checkout develop branch | ||
| if: ${{ github.ref }} == 'master' | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| ref: 'develop' | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Merge release branch into develop | ||
| id: mergeIntoDevelop | ||
| if: ${{ github.ref }} == 'master' | ||
| run: | | ||
| git merge -m 'Merge master branch into develop after a release' origin/master | ||
| git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \ | ||
| | { echo -e 'Unable to merge master into develop, merge conflicts:'; (! grep -Eo '[^ ]+$') } | ||
| git push | ||
| git push origin develop | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.