diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml new file mode 100644 index 00000000..7a21c72d --- /dev/null +++ b/.github/workflows/create-github-release.yml @@ -0,0 +1,25 @@ +name: create-github-release + +on: + push: + branches: + - main + - prerelease/** + tags-ignore: + - '*' + workflow_dispatch: + inputs: + prerelease: + type: string + description: 'Name to use for the prerelease: beta, dev, etc. NOTE: If this is already set in the package.json, it does not need to be passed in here.' + +jobs: + release: + uses: salesforcecli/github-workflows/.github/workflows/create-github-release.yml@main + secrets: inherit + with: + prerelease: ${{ inputs.prerelease }} + # If this is a push event, we want to skip the release if there are no semantic commits + # However, if this is a manual release (workflow_dispatch), then we want to disable skip-on-empty + # This helps recover from forgetting to add semantic commits ('fix:', 'feat:', etc.) + skip-on-empty: ${{ github.event_name == 'push' }} diff --git a/.github/workflows/manualRelease.yml b/.github/workflows/manualRelease.yml deleted file mode 100644 index 44441be2..00000000 --- a/.github/workflows/manualRelease.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Manual Release - -on: - workflow_dispatch: - -jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - token: ${{ secrets.IDEE_GH_TOKEN }} - - name: Conventional Changelog Action - id: changelog - uses: TriPSs/conventional-changelog-action@d360fad3a42feca6462f72c97c165d60a02d4bf2 - # overriding some of the basic behaviors to just get the changelog - with: - git-user-name: Release Bot - git-user-email: ${{ secrets.IDEE_GH_EMAIL }} - github-token: ${{ secrets.IDEE_GH_TOKEN }} - output-file: false - # always do the release, even if there are no semantic commits - skip-on-empty: false - tag-prefix: '' - - uses: notiz-dev/github-action-json-property@7a701887f4b568b23eb7b78bb0fc49aaeb1b68d3 - id: packageVersion - with: - path: 'package.json' - prop_path: 'version' - - name: Create Github Release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.IDEE_GH_TOKEN }} - with: - tag_name: ${{ steps.packageVersion.outputs.prop }} - release_name: ${{ steps.packageVersion.outputs.prop }} diff --git a/.github/workflows/onPushToMain.yml b/.github/workflows/onPushToMain.yml deleted file mode 100644 index 445d2c89..00000000 --- a/.github/workflows/onPushToMain.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Version, Tag and Github Release - -on: - push: - branches: [main] - -jobs: - release: - uses: salesforcecli/github-workflows/.github/workflows/githubRelease.yml@main - secrets: - SVC_CLI_BOT_GITHUB_TOKEN: ${{ secrets.IDEE_GH_TOKEN }} diff --git a/.github/workflows/slackNotification.yml b/.github/workflows/slackNotification.yml index 9ce50b29..d6f362af 100644 --- a/.github/workflows/slackNotification.yml +++ b/.github/workflows/slackNotification.yml @@ -3,7 +3,7 @@ name: Slack Notification on: workflow_run: workflows: - - version, tag and github release + - create-github-release - publish types: - completed diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ea51107..48a6d93b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +## [62.0.2](https://github.com/forcedotcom/salesforcedx-templates/compare/62.0.1...62.0.2) (2024-10-18) + + +### Bug Fixes + +* revert to eslint 8 ([#623](https://github.com/forcedotcom/salesforcedx-templates/issues/623)) ([168bca5](https://github.com/forcedotcom/salesforcedx-templates/commit/168bca54000c076af7cc8d3dcc1dd99395194468)) + + + +## [62.0.1](https://github.com/forcedotcom/salesforcedx-templates/compare/61.4.12...62.0.1) (2024-10-07) + + + ## [61.4.12](https://github.com/forcedotcom/salesforcedx-templates/compare/61.4.11...61.4.12) (2024-10-02) diff --git a/package.json b/package.json index 38a32847..effc124c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/templates", - "version": "62.0.1", + "version": "62.0.2", "description": "Salesforce JS library for templates", "bugs": "https://github.com/forcedotcom/salesforcedx-templates/issues", "main": "lib/index.js",