Skip to content

Commit

Permalink
fix: Added the following changes: (twilio#301)
Browse files Browse the repository at this point in the history
1. Updated OAI commit not to include in release notes and changeLog
2. Updated the yml with proper names
  • Loading branch information
ravali-rimmalapudi committed Oct 5, 2021
1 parent dafeef6 commit c69e226
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/commit-api-spec-change-log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ if [ -n "$(git status --porcelain)" ]; then
commitMessage=''
if [ "$versionType" == 0 ] || [ "$versionType" == 1 ]
then
commitMessage='feat: Updated api definitions changelog in CHANGES.md'
commitMessage='oaiFeat: Updated api definitions changelog in CHANGES.md'
elif [ "$versionType" == 2 ]
then
commitMessage='fix: Updated api definitions changelog in CHANGES.md'
commitMessage='oaiFix: Updated api definitions changelog in CHANGES.md'
else
echo "Invalid versionType: $versionType";
exit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oclif-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
description: 'Run workflow in home brew branch'
default: main
tag-name:
description: 'Tag released recently'
description: 'Tag to be released in Homebrew (Same as CLI latest tag name)'
required: true
formula:
description: 'Formula to release in homebrew'
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ on:
inputs:
change-log:
description: 'Open API Changelog.'
required: true
version-type:
description: 'Version to upgrade, Major: 0, Minor:1, Patch: 2'
required: true
homebrew-branch:
description: 'HomeBrew branch name'
default: main
Expand Down Expand Up @@ -64,11 +62,11 @@ jobs:
GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Update release
if: ${{steps.semantic-release.outputs.tag-name != ''}}
if: ${{steps.semantic-release.outputs.TAG_NAME != ''}}
run: node .github/scripts/update-release.js
env:
GITHUB_TOKEN: ${{ github.token }}
TAG_NAME: ${{steps.semantic-release.outputs.tag-name}}
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-core
oclif-release:
Expand Down Expand Up @@ -111,6 +109,11 @@ jobs:
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/})"
Expand Down
6 changes: 6 additions & 0 deletions .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"releaseRules": [{
"type": "chore",
"release": "patch"
},{
"type": "oaiFix",
"release": "patch"
},{
"type": "oaiFeat",
"release": "minor"
}]
}
],
Expand Down

0 comments on commit c69e226

Please sign in to comment.