Skip to content

Commit

Permalink
feat: Merging main into release-feature-branch (#322)
Browse files Browse the repository at this point in the history
  • Loading branch information
sr010 committed Nov 3, 2021
1 parent 943c3d6 commit ef1f6d3
Show file tree
Hide file tree
Showing 10 changed files with 145 additions and 104 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/cli-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Cli Tests
on:
push:
branches: [ main ]
pull_request:

jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node-version: [16.x, 14.x, 10.x]
steps:
- name: Checkout cli repo
uses: actions/checkout@v2
- run: npm install
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Run tests
run: npm test
sonarcloud:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
# Disabling shallow clone is recommended for improving relevancy of reporting.
fetch-depth: 0
- name: SonarCloud Scan
uses: sonarsource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
notify-complete-fail:
if: ${{ failure() || cancelled() }}
needs: [ test, sonarcloud ]
name: Notify Test Failed
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Slack Notification
uses: rtCamp/action-slack-notify@v2
env:
SLACK_WEBHOOK: ${{ secrets.ALERT_SLACK_WEB_HOOK }}
SLACK_COLOR: ${{ job.status }}
SLACK_USERNAME: CLI Github Actions
SLACK_MSG_AUTHOR: twilio-dx
SLACK_ICON_EMOJI: ':github:'
SLACK_TITLE: "Twilio Cli"
SLACK_MESSAGE: 'Cli tests failed'
MSG_MINIMAL: actions url
SLACK_FOOTER: Posted automatically using GitHub Actions
6 changes: 3 additions & 3 deletions .github/workflows/oclif-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
include:
- os: macos-latest
asset_name: ${{ github.event.inputs.formula }}-v${{ github.event.inputs.tag-name }}
command_name: npx oclif-dev pack
command_name: npx oclif-dev pack --xz
publish: homebrew
steps:
- uses: actions/checkout@v2
Expand All @@ -49,7 +49,7 @@ jobs:
run: |
npx oclif-dev publish
brew install coreutils
echo "::set-output name=sha256::$(sha256sum dist/${{ matrix.asset_name }}/${{ matrix.asset_name }}.tar.gz | awk '{print $1}')"
echo "::set-output name=sha256::$(sha256sum dist/channels/rc/${{ matrix.asset_name }}/${{ matrix.asset_name }}.tar.gz | awk '{print $1}')"
home-brew-release:
name: Trigger homebrew release workflow
runs-on: ubuntu-latest
Expand All @@ -60,7 +60,7 @@ jobs:
- name: Invoke HomeBrew workflow
run: source .github/scripts/trigger-and-wait.sh
env:
INPUT_OWNER: twilio
INPUT_OWNER: shamantraghav
INPUT_REPO: homebrew-brew
INPUT_GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
INPUT_WORKFLOW_FILE_NAME: release.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/platform-executables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
FILE: dist/${{ matrix.artifact_name }}
ASSET_NAME: ${{ matrix.asset_name }}
TAG_NAME: ${{ needs.get-tag.outputs.TAG_NAME }}
REPO_NAME: twilio/twilio-cli
REPO_NAME: shamantraghav/twilio-cli
notify-complete-fail:
if: ${{ failure() || cancelled() }}
needs: [ platform-executables-release ]
Expand Down
46 changes: 23 additions & 23 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
REPO_ACCESS_TOKEN: ${{ github.token }}
TAG_NAME: ${{steps.semantic-release.outputs.TAG_NAME}}
RELEASE_BODY: ${{github.event.inputs.change-log}}
REPO_NAME: twilio/twilio-cli
REPO_NAME: shamantraghav/twilio-cli
oclif-release:
runs-on: ubuntu-latest
needs: [ release ]
Expand All @@ -86,30 +86,30 @@ jobs:
run: node .github/scripts/trigger-workflow.js
env:
WORKFLOW_NAME: 'oclif-release.yml'
REPO_NAME: twilio/twilio-cli
REPO_NAME: shamantraghav/twilio-cli
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
BRANCH_NAME: ${{steps.extract_branch.outputs.branch}}
INPUTS: '{ "home-brew-branch": "${{github.event.inputs.homebrew-branch}}", "tag-name": "${{needs.release.outputs.tag-name}}", "pre-release": "${{github.event.inputs.homebrew-prerelease}}"}'
docker-release:
runs-on: ubuntu-latest
needs: [ release ]
steps:
- name: Checkout cli repo
uses: actions/checkout@v2
- run: |
git pull
npm install
- name: Extract branch name
id: extract_branch
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
- name: Invoke Docker workflow
if: ${{needs.release.outputs.tag-name != ''}}
run: node .github/scripts/trigger-workflow.js
env:
WORKFLOW_NAME: 'docker-release.yml'
REPO_NAME: twilio/twilio-cli
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
BRANCH_NAME: ${{steps.extract_branch.outputs.branch}}
# docker-release:
# runs-on: ubuntu-latest
# needs: [ release ]
# steps:
# - name: Checkout cli repo
# uses: actions/checkout@v2
# - run: |
# git pull
# npm install
# - name: Extract branch name
# id: extract_branch
# run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
# - name: Invoke Docker workflow
# if: ${{needs.release.outputs.tag-name != ''}}
# run: node .github/scripts/trigger-workflow.js
# env:
# WORKFLOW_NAME: 'docker-release.yml'
# REPO_NAME: twilio/twilio-cli
# REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
# BRANCH_NAME: ${{steps.extract_branch.outputs.branch}}
platform-executables-release:
runs-on: ubuntu-latest
needs: [ release ]
Expand All @@ -127,7 +127,7 @@ jobs:
run: node .github/scripts/trigger-workflow.js
env:
WORKFLOW_NAME: 'platform-executables.yml'
REPO_NAME: twilio/twilio-cli
REPO_NAME: shamantraghav/twilio-cli
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
BRANCH_NAME: ${{steps.extract_branch.outputs.branch}}
notify-complete-fail:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/rpmbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: RPM Build

on:
workflow_dispatch:
workflow_run:
# wait for Cli Release to complete, when it completes, start this workflow
workflows: ["Cli Release"]
branches: [main]
types:
- completed
# workflow_run:
# # wait for Cli Release to complete, when it completes, start this workflow
# workflows: ["Cli Release"]
# branches: [main]
# types:
# - completed
jobs:

rpmbuild:
Expand Down
20 changes: 14 additions & 6 deletions .github/workflows/slack-notification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,29 @@ on:
types:
- completed
jobs:
get-branch:
name: Get Current Branch Name
runs-on: ubuntu-latest
outputs:
branch: ${{ steps.extract_branch.outputs.branch }}
if: ${{ github.event.workflow_run.conclusion != 'failure' }}
steps:
- name: Extract branch name
id: extract_branch
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
wait-for-releases:
name: Wait for Docker, Homebrew, RPM and Platform executables Release
runs-on: ubuntu-latest
needs: [ get-branch ]
env:
INPUT_OWNER: twilio
INPUT_REPO: twilio-cli
INPUT_GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
INPUT_REF: ${{steps.extract_branch.outputs.branch}}
INPUT_REF: ${{ needs.get-branch.outputs.branch }}
INPUT_WAITING_INTERVAL: 10
INPUT_PROPAGATE_FAILURE: true
INPUT_TRIGGER_WORKFLOW: false
name: Wait for Docker, Homebrew, RPM and Platform executables Release
runs-on: ubuntu-latest
steps:
- name: Extract branch name
id: extract_branch
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
- name: Checkout cli repo
uses: actions/checkout@v2
- name: Wait for Docker Release
Expand Down
9 changes: 7 additions & 2 deletions .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"branches": [
"main",
{
"name": "release_feature_branch",
"name": "release-feature-branch",
"prerelease": "rc"
}
],
Expand Down Expand Up @@ -58,7 +58,12 @@
"changelogFile": "CHANGES.md"
}
],
"@semantic-release/npm",
[
"@semantic-release/npm",
{
"npmPublish": false
}
],
[
"@semantic-release/github",
{
Expand Down
91 changes: 32 additions & 59 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,45 @@
### [2.32.1](https://github.com/twilio/twilio-cli/compare/2.32.0...2.32.1) (2021-10-19)
## [2.27.0-rc.1](https://github.com/shamantraghav/twilio-cli/compare/2.26.0...2.27.0-rc.1) (2021-10-27)


### Library - Fixes

* Revert "Resolve security vulnerability ([#306](https://github.com/twilio/twilio-cli/issues/306))" ([#315](https://github.com/twilio/twilio-cli/issues/315)) ([#316](https://github.com/twilio/twilio-cli/issues/316)) ([53a2ded](https://github.com/twilio/twilio-cli/commit/53a2ded1a89d22bcf18fd2602c89646a4287eb3c))
### Library - Chores

## [2.32.0](https://github.com/twilio/twilio-cli/compare/2.31.0...2.32.0) (2021-10-19)
* **release:** set `package.json` to 2.30.0 [skip ci] ([c451e50](https://github.com/shamantraghav/twilio-cli/commit/c451e50810f0b17a5ba55147cc04a0751795bc02)), closes [#289](https://github.com/shamantraghav/twilio-cli/issues/289) [#287](https://github.com/shamantraghav/twilio-cli/issues/287) [#284](https://github.com/shamantraghav/twilio-cli/issues/284) [#286](https://github.com/shamantraghav/twilio-cli/issues/286) [#285](https://github.com/shamantraghav/twilio-cli/issues/285)
* **release:** set `package.json` to 2.30.1 [skip ci] ([60207e0](https://github.com/shamantraghav/twilio-cli/commit/60207e0362772f3ff045b816195e34f42b8e2209)), closes [#294](https://github.com/shamantraghav/twilio-cli/issues/294) [#295](https://github.com/shamantraghav/twilio-cli/issues/295) [#293](https://github.com/shamantraghav/twilio-cli/issues/293)
* **release:** set `package.json` to 2.30.2 [skip ci] ([e2143ca](https://github.com/shamantraghav/twilio-cli/commit/e2143cac602bbc07e1535727bd457a6b2346b0bd)), closes [#297](https://github.com/shamantraghav/twilio-cli/issues/297)
* **release:** set `package.json` to 2.31.0 [skip ci] ([7b46f83](https://github.com/shamantraghav/twilio-cli/commit/7b46f83369fc0077d00ffe95f578f75b14b72eb6)), closes [#298](https://github.com/shamantraghav/twilio-cli/issues/298) [#301](https://github.com/shamantraghav/twilio-cli/issues/301)
* **release:** set `package.json` to 2.32.0 [skip ci] ([4e0b6f2](https://github.com/shamantraghav/twilio-cli/commit/4e0b6f2e7b3ea4ee4baaed093c190fc509f389c3)), closes [#304](https://github.com/shamantraghav/twilio-cli/issues/304) [#310](https://github.com/shamantraghav/twilio-cli/issues/310)
* **release:** set `package.json` to 2.32.1 [skip ci] ([943c3d6](https://github.com/shamantraghav/twilio-cli/commit/943c3d6aa899190aca27c0f836b1449579e18eb2)), closes [#306](https://github.com/shamantraghav/twilio-cli/issues/306) [#315](https://github.com/shamantraghav/twilio-cli/issues/315) [#316](https://github.com/shamantraghav/twilio-cli/issues/316)
* Add docker workflow to github actions ([#289](https://github.com/shamantraghav/twilio-cli/issues/289)) ([7e9d233](https://github.com/shamantraghav/twilio-cli/commit/7e9d233a5299f0f108af97b3299d286c39bfa226))
* Custom help implementation for displaying required flags ([#281](https://github.com/shamantraghav/twilio-cli/issues/281)) ([ecc315a](https://github.com/shamantraghav/twilio-cli/commit/ecc315a006761f9afbc05c9958ad683fa8bf56d7))
* Replaced the community actions with the scripts ([#298](https://github.com/shamantraghav/twilio-cli/issues/298)) ([316aeb6](https://github.com/shamantraghav/twilio-cli/commit/316aeb6cc98beab8c145d9be1b93f381aea56cfb))
* rotate sonarcloud token ([30f7bc7](https://github.com/shamantraghav/twilio-cli/commit/30f7bc7435795db73a5ef7f01d7328eaa316d6aa))


### Library - Features

* Added the slack notifications for Github actions ([#304](https://github.com/twilio/twilio-cli/issues/304)) ([8a14fdb](https://github.com/twilio/twilio-cli/commit/8a14fdb8afb650f1e656b4a3fd9e6b2186c835ff))
* Added github actions for publish to s3 and trigger homebrew release ([#287](https://github.com/shamantraghav/twilio-cli/issues/287)) ([5d7acd6](https://github.com/shamantraghav/twilio-cli/commit/5d7acd6f9d04361d3b5a43ff9bfc5ae5c9d3be38))
* Added the GitHub actions for cli ([#284](https://github.com/shamantraghav/twilio-cli/issues/284)) ([49e2376](https://github.com/shamantraghav/twilio-cli/commit/49e23764205487d132cf84cf7ad9ee7c11ca53d1))
* Added the slack notifications for Github actions ([#304](https://github.com/shamantraghav/twilio-cli/issues/304)) ([8a14fdb](https://github.com/shamantraghav/twilio-cli/commit/8a14fdb8afb650f1e656b4a3fd9e6b2186c835ff))
* Added the tests and sonarcloud jobs ([#312](https://github.com/shamantraghav/twilio-cli/issues/312)) ([bfc7d57](https://github.com/shamantraghav/twilio-cli/commit/bfc7d573919c6beb23acd9844a923cbf3fb885d4))
* DII 47 hyperlinks in help ([#290](https://github.com/shamantraghav/twilio-cli/issues/290)) ([ce15661](https://github.com/shamantraghav/twilio-cli/commit/ce156611cea15af15dee6fefd9761f31e8754a19)), closes [#286](https://github.com/shamantraghav/twilio-cli/issues/286) [#285](https://github.com/shamantraghav/twilio-cli/issues/285)
* link to our API docs when you --help ([#283](https://github.com/shamantraghav/twilio-cli/issues/283)) ([37a857d](https://github.com/shamantraghav/twilio-cli/commit/37a857d8ac587ec59d2912f9d2a00cfe77fcb5c3))


### Library - Fixes

* Pin node version to 14.18.1 in Dockerfile ([#310](https://github.com/twilio/twilio-cli/issues/310)) ([0588491](https://github.com/twilio/twilio-cli/commit/058849189a2d54695655f5f7b00b8a15eae90148))
* Add aws session token ([#294](https://github.com/shamantraghav/twilio-cli/issues/294)) ([8cfac65](https://github.com/shamantraghav/twilio-cli/commit/8cfac65755e445ff4c6c579704d4109fd4b859da))
* Added missing require statement ([#285](https://github.com/shamantraghav/twilio-cli/issues/285)) ([10179cc](https://github.com/shamantraghav/twilio-cli/commit/10179ccfb757e8b289802d4e41c940bd3e4fc1b1))
* Added the condition to check the tag regex ([#279](https://github.com/shamantraghav/twilio-cli/issues/279)) ([ce87562](https://github.com/shamantraghav/twilio-cli/commit/ce875622ad03ef31d9d702629d0a91fec089888d))
* Added the following changes: ([#301](https://github.com/shamantraghav/twilio-cli/issues/301)) ([c69e226](https://github.com/shamantraghav/twilio-cli/commit/c69e2261429eac4068854f3012d709d8e8f7841a))
* Fixing failing test on twilio-cli ([#280](https://github.com/shamantraghav/twilio-cli/issues/280)) ([01afb70](https://github.com/shamantraghav/twilio-cli/commit/01afb7006b127a067c02a94109c48f370a6b5379))
* Fixing the release issue ([#313](https://github.com/shamantraghav/twilio-cli/issues/313)) ([b893be6](https://github.com/shamantraghav/twilio-cli/commit/b893be61f0ca1543b8f8c5d0728ea1b7fcdfdbed))
* Fork docker release workflow ([#295](https://github.com/shamantraghav/twilio-cli/issues/295)) ([c669c06](https://github.com/shamantraghav/twilio-cli/commit/c669c0626e6a2aaacb638be2f9badc1f4c1acdbe))
* Hide tests showing non-deterministic behaviour ([#293](https://github.com/shamantraghav/twilio-cli/issues/293)) ([75aa40c](https://github.com/shamantraghav/twilio-cli/commit/75aa40c6671aac6c4e1be72b6c10cd443fbc7893))
* Pin node version to 14.18.1 in Dockerfile ([#310](https://github.com/shamantraghav/twilio-cli/issues/310)) ([0588491](https://github.com/shamantraghav/twilio-cli/commit/058849189a2d54695655f5f7b00b8a15eae90148))
* Pin peer dependency semantic-release ([#318](https://github.com/shamantraghav/twilio-cli/issues/318)) ([00ac1d8](https://github.com/shamantraghav/twilio-cli/commit/00ac1d8809b8c410445be67a7dc6f5154c2452de))
* replaceAll bug ([#297](https://github.com/shamantraghav/twilio-cli/issues/297)) ([3e85ed2](https://github.com/shamantraghav/twilio-cli/commit/3e85ed2b1223aa5111bcd4690fb55ae5e5dae26a))
* Revert "Resolve security vulnerability ([#306](https://github.com/shamantraghav/twilio-cli/issues/306))" ([#315](https://github.com/shamantraghav/twilio-cli/issues/315)) ([#316](https://github.com/shamantraghav/twilio-cli/issues/316)) ([53a2ded](https://github.com/shamantraghav/twilio-cli/commit/53a2ded1a89d22bcf18fd2602c89646a4287eb3c))
* Updated api definitions changelog in CHANGES.md ([3236031](https://github.com/shamantraghav/twilio-cli/commit/32360314cc5ec00f752138c4127c37d59669fe76))

---------------------------
**Api**
Expand All @@ -28,58 +52,7 @@
- Add brand_feedback as optional field to BrandRegistrations

**Video**
- Add to create room## [2.31.0](https://github.com/twilio/twilio-cli/compare/2.30.2...2.31.0) (2021-10-07)


### Library - Chores

* Replaced the community actions with the scripts ([#298](https://github.com/twilio/twilio-cli/issues/298)) ([316aeb6](https://github.com/twilio/twilio-cli/commit/316aeb6cc98beab8c145d9be1b93f381aea56cfb))


### Library - Fixes

* Added the following changes: ([#301](https://github.com/twilio/twilio-cli/issues/301)) ([c69e226](https://github.com/twilio/twilio-cli/commit/c69e2261429eac4068854f3012d709d8e8f7841a))

---------------------------
**Library - Fix**
- [PR #44](https://github.com/twilio/twilio-oai/pull/44): fix naming of params. Thanks to [@shwetha-manvinkurke](https://github.com/shwetha-manvinkurke)!

**Api**
- Add attribute to response.
- Add resource

**Conversations**
- Added attachment parameters in configuration for type of push notifications

**Flex**
- Adding object to Flex Configuration

**Numbers**
- Add API endpoint for Bundle ReplaceItems resource
- Add API endpoint for Bundle Copies resource

**Serverless**
- Add domain_base field to Service response

**Taskrouter**
- Add Header based on ETag for Worker Delete **(breaking change)**
- Add Header based on Etag for Reservation Update
- Add Header based on ETag for Worker Update
- Add Header based on ETag for Worker Delete
- Add as Response Header to Worker

**Trunking**
- Added property on Trunks.

**Verify**
- Document new pilot channel.### [2.30.2](https://github.com/twilio/twilio-cli/compare/2.30.1...2.30.2) (2021-09-24)


### Library - Fixes

* replaceAll bug ([#297](https://github.com/twilio/twilio-cli/issues/297)) ([3e85ed2](https://github.com/twilio/twilio-cli/commit/3e85ed2b1223aa5111bcd4690fb55ae5e5dae26a))

### [2.30.1](https://github.com/twilio/twilio-cli/compare/2.30.0...2.30.1) (2021-09-24)
- Add to create room### [2.30.1](https://github.com/twilio/twilio-cli/compare/2.30.0...2.30.1) (2021-09-24)


### Library - Fixes
Expand Down
1 change: 0 additions & 1 deletion githooks/pre-commit
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
make test
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twilio-cli",
"version": "2.32.1",
"version": "2.27.0-rc.1",
"description": "Unleash the power of Twilio from your command prompt. Visit https://twil.io/cli for documentation.",
"keywords": [
"oclif"
Expand All @@ -9,7 +9,7 @@
"bugs": "https://github.com/twilio/twilio-cli/issues",
"repository": {
"type": "git",
"url": "https://github.com/twilio/twilio-cli.git"
"url": "https://github.com/shamantraghav/twilio-cli.git"
},
"license": "MIT",
"author": "Twilio @twilio",
Expand Down Expand Up @@ -74,6 +74,7 @@
"nock": "^13.0.2",
"nyc": "^15.1.0",
"proxyquire": "^2.1.3",
"semantic-release": "^17.2.3",
"sinon": "^9.0.2",
"tildify": "^2.0.0",
"tmp": "^0.2.1"
Expand Down Expand Up @@ -125,7 +126,7 @@
},
"update": {
"s3": {
"bucket": "twilio-cli-prod"
"bucket": "sr-buck"
}
},
"helpClass": "./src/services/twilio-help/custom-help"
Expand Down

0 comments on commit ef1f6d3

Please sign in to comment.