diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index fa2c29a1e9a..42aea9685b6 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -1,28 +1,34 @@ -on: - push: - branches: - - release - - master - - hotfix-* +on: [push] + # push: + # branches: + # - release + # - master + # - hotfix-* + +permissions: + contents: write + pull-requests: write + name: release-please + jobs: release-please: runs-on: ubuntu-latest - outputs: - release_created: ${{ steps.release-please.outputs.release_created }} - tag_name: ${{ steps.release-please.outputs.tag_name }} steps: - uses: google-github-actions/release-please-action@v3 - id: release-please + id: release with: command: manifest default-branch: release - docker-build: - needs: release-please - if: needs.release-please.outputs.release_created - #runs-on: ubuntu-8cores - runs-on: ubuntu-latest - steps: - - name: Print tag if it was a release + - uses: actions/checkout@v2 + if: ${{ steps.release.outputs.release_created }} + - name: Tagging the release + if: ${{ steps.release.outputs.release_created }} run: | - echo ${{ needs.release-please.outputs.tag_name }} + git config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com + git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git" + git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} || true + git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} || true + git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }}" + git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 071db81730e..90126b1c766 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "6.1004.0" + ".": "6.1005.2" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 92c7aa5c71d..4aaf6bc7151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,40 @@ This project adheres to [Semantic Versioning](http://semver.org/). This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/). +## [6.1005.2](https://github.com/rafaelromcar-parabol/parabol/compare/v6.1005.1...v6.1005.2) (2023-10-23) + + +### Fixed + +* **ci:** on push now ([9957bbb](https://github.com/rafaelromcar-parabol/parabol/commit/9957bbb8429501282339186f811cde21e6d954d3)) + +## [6.1005.1](https://github.com/rafaelromcar-parabol/parabol/compare/v6.1005.0...v6.1005.1) (2023-10-23) + + +### Fixed + +* **ci:** checkout only on releases ([4e8734a](https://github.com/rafaelromcar-parabol/parabol/commit/4e8734a9a06c710de2f270262ddbbf204691efb9)) +* **ci:** in one job ([34e6f25](https://github.com/rafaelromcar-parabol/parabol/commit/34e6f25bd5a6ab7e11d40f3004ae6354c9f80cc3)) + +## [6.1005.0](https://github.com/rafaelromcar-parabol/parabol/compare/v6.1004.1...v6.1005.0) (2023-10-23) + + +### Added + +* **ci:** release-please runs on master and hotfix as well now ([d6e4045](https://github.com/rafaelromcar-parabol/parabol/commit/d6e4045d9a673fba29c7a5f918eea93f382e601b)) + + +### Changed + +* **ci:** tagging the release ([73dd8ba](https://github.com/rafaelromcar-parabol/parabol/commit/73dd8baddef8e23d8420909889fdc651b99f915e)) + +## [6.1004.1](https://github.com/rafaelromcar-parabol/parabol/compare/v6.1004.0...v6.1004.1) (2023-10-20) + + +### Fixed + +* **ci:** docker-build uses outputs from release-please correctly now ([7a2a3d3](https://github.com/rafaelromcar-parabol/parabol/commit/7a2a3d33b0c8b2a793b78b5aa3410dc8c750fe72)) + ## [6.1004.0](https://github.com/rafaelromcar-parabol/parabol/compare/v6.1003.0...v6.1004.0) (2023-10-20) diff --git a/package.json b/package.json index 3aeaa58740a..1a57e4a0663 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "An open-source app for building smarter, more agile teams.", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "6.1004.0", + "version": "6.1005.2", "repository": { "type": "git", "url": "https://github.com/ParabolInc/parabol" diff --git a/packages/chronos/package.json b/packages/chronos/package.json index 9a901625f98..1440716bb3f 100644 --- a/packages/chronos/package.json +++ b/packages/chronos/package.json @@ -1,6 +1,6 @@ { "name": "chronos", - "version": "6.1004.0", + "version": "6.1005.2", "description": "A cron job scheduler", "author": "Matt Krick ", "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme", diff --git a/packages/client/package.json b/packages/client/package.json index e45e97f783c..f4b4a8f8d99 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -3,7 +3,7 @@ "description": "An open-source app for building smarter, more agile teams.", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "6.1004.0", + "version": "6.1005.2", "repository": { "type": "git", "url": "https://github.com/ParabolInc/parabol" diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json index 5ff1135daea..0de9c30eb1a 100644 --- a/packages/gql-executor/package.json +++ b/packages/gql-executor/package.json @@ -1,6 +1,6 @@ { "name": "gql-executor", - "version": "6.1004.0", + "version": "6.1005.2", "description": "A Stateless GraphQL Executor", "author": "Matt Krick ", "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme", diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 4ce7f43a6fc..07896ab084a 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -2,7 +2,7 @@ "name": "integration-tests", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "6.1004.0", + "version": "6.1005.2", "description": "", "main": "index.js", "scripts": { diff --git a/packages/server/package.json b/packages/server/package.json index a07e7f17f0f..1e7649b3a63 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -3,7 +3,7 @@ "description": "An open-source app for building smarter, more agile teams.", "author": "Parabol Inc. (http://github.com/ParabolInc)", "license": "AGPL-3.0", - "version": "6.1004.0", + "version": "6.1005.2", "repository": { "type": "git", "url": "https://github.com/ParabolInc/parabol"