Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/handle-non…
Browse files Browse the repository at this point in the history
…-yospace-id3tags-gracefully

 Conflicts:
	CHANGELOG.md
  • Loading branch information
dweinber committed Jul 10, 2024
2 parents 76e3fe3 + 00c3566 commit 70fa9c5
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 60 deletions.
22 changes: 16 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v3
with:
ssh-key: ${{ secrets.RELEASE_DEPLOY_KEY }}
ref: develop

# The Yospace private npm registry seems to not support NPM token so we sadly need to use password and email
- name: Log in to Yospace private NPM registry
Expand Down Expand Up @@ -51,21 +54,28 @@ jobs:
const { defineReleaseVersion } = require('./.github/scripts/defineVersion.js')
return defineReleaseVersion({core}, "${{ steps.read-latest-release-version.outputs.latestReleaseVersion }}", './CHANGELOG.md' )
- name: Bump package.json and Changelog version and tag commit
- name: Bump package.json and Changelog version
run: |
git config --global user.name 'Automated Release'
git config --global user.email 'release-automation@bitmovin.com'
npm version "${{ fromJson(steps.define-release-version.outputs.result) }}"
npm --no-git-tag-version version "${{ fromJson(steps.define-release-version.outputs.result) }}"
npx kacl release
- name: Push changes
- name: Add tag and push changes
run: |
git config --global user.name 'Automated Release'
git config --global user.email 'release-automation@bitmovin.com'
git add .
git commit -m "Bump version and update changelog"
git tag -a "${{ fromJson(steps.define-release-version.outputs.result) }}" -m "v${{ fromJson(steps.define-release-version.outputs.result) }}"
git push origin develop
git push origin --tags
- name: build and publish
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}" > ~/.npmrc
npm run publish
npm publish
- name: Create GitHub release
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
tag_name: ${{ fromJson(steps.define-release-version.outputs.result) }}
Loading

0 comments on commit 70fa9c5

Please sign in to comment.