diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml index 93ddd82..66918cc 100644 --- a/.github/workflows/draft-new-release.yml +++ b/.github/workflows/draft-new-release.yml @@ -11,8 +11,12 @@ jobs: draft-new-release: name: "Draft a new release" runs-on: ubuntu-latest + outputs: + pr_url: ${{ steps.pull_request.outputs.pr_url }} steps: - uses: actions/checkout@v3 + with: + token: ${{ secrets.PERSONAL_GITHUB_TOKEN }} - name: Check if release tag exists run: | if [[ $(git ls-remote --tags origin refs/tags/"${{ github.event.inputs.version }}") ]]; then @@ -64,16 +68,15 @@ jobs: commit_message: Edit changelog versions branch: release/${{ github.event.inputs.version }} create_branch: true + commit_user_name: Angel Arroyo + commit_user_email: aarroyo@cartodb.com - name: Create pull request uses: repo-sync/pull-request@v2 id: pull_request - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: source_branch: release/${{ github.event.inputs.version }} destination_branch: stable pr_title: Release version ${{ github.event.inputs.version }} - pr_reviewer: ${{ github.actor }} pr_body: | This PR was created in response to a manual trigger of the release workflow here: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}. Please, check that the version files and changelogs are correct. @@ -101,3 +104,27 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }} run: gh workflow run -R https://github.com/CartoDB/documentation.git update-doc.yml -f version=new-${{ github.event.inputs.version }} + + notify-slack: + runs-on: ubuntu-20.04 + name: "Notify Slack" + needs: + - draft-new-release + env: + RELEASE_VERSION: ${{ github.event.inputs.version }} + steps: + - name: Slack notification (#carto-selfhosted) + env: + SLACK_CHANNEL: CRQT3HKCH #analytics-toolbox + SLACK_KEY: ${{ secrets.SLACK_KEY }} + PR_URL: ${{ needs.draft-new-release.outputs.pr_url }} + run: | + set -eu + MESSAGE="Analytics toolbox Release \`${RELEASE_VERSION}\` is ready, please review and merge the PR: + - *Status:* :white_check_mark: + - *<${PR_URL}|Pull Request Analytics toolbox>*" + curl \ + -F "text=${MESSAGE}" \ + -F "channel=${SLACK_CHANNEL}" \ + -H "Authorization: Bearer ${SLACK_KEY}" \ + -X POST https://slack.com/api/chat.postMessage \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 135dcfe..50af56a 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -22,6 +22,8 @@ jobs: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix/')) steps: - uses: actions/checkout@v3 + with: + token: ${{ secrets.PERSONAL_GITHUB_TOKEN }} - name: Extract version from branch name (for release branches) if: startsWith(github.event.pull_request.head.ref, 'release/') run: | @@ -92,7 +94,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - source_branch: stable + source_branch: ${{ github.event.pull_request.head.ref }} destination_branch: main pr_title: Merge master into dev branch pr_body: | @@ -101,7 +103,7 @@ jobs: - name: Merge PR if possible env: - GH_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }} run: | gh pr merge ${{ steps.pull_request.outputs.pr_number }} --auto --merge diff --git a/clouds/bigquery/CHANGELOG.md b/clouds/bigquery/CHANGELOG.md index 611b160..844c3b9 100644 --- a/clouds/bigquery/CHANGELOG.md +++ b/clouds/bigquery/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [1.4.0] - 2022-11-16 + +### Changed + +- add nice stuff + ## [1.3.9] - 2022-11-15 ### Changed diff --git a/clouds/bigquery/version b/clouds/bigquery/version index 2fe9589..e21e727 100644 --- a/clouds/bigquery/version +++ b/clouds/bigquery/version @@ -1 +1 @@ -1.3.9 \ No newline at end of file +1.4.0 \ No newline at end of file