Skip to content

Commit 5d5f8c9

Browse files
jschonning-sfjschonning-sf
authored
Merge branch 'main' into prerelease/jschonning/W-14245254-allVersionsFlag
2 parents 57df938 + 13e8aba commit 5d5f8c9

File tree

11 files changed

+96
-94
lines changed

11 files changed

+96
-94
lines changed

‎.github/ISSUE_TEMPLATE/Bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ NOTICE: While GitHub is the preferred channel for reporting issues/feedback, thi
88
-->
99

1010
<!--
11-
FOR BUGS RELATED TO THE SALEFORCE CLI, please use this repository: https://github.com/forcedotcom/cli-packages
11+
FOR BUGS RELATED TO THE SALEFORCE CLI, please use this repository: https://github.com/forcedotcom/cli/issues
1212
-->
1313

1414
### Summary

‎.github/workflows/create-github-release.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: create-github-release
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- prerelease/**
8+
tags-ignore:
9+
- "*"
10+
workflow_dispatch:
11+
inputs:
12+
prerelease:
13+
type: string
14+
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."
15+
16+
jobs:
17+
release:
18+
uses: salesforcecli/github-workflows/.github/workflows/create-github-release.yml@main
19+
secrets: inherit
20+
with:
21+
prerelease: ${{ inputs.prerelease }}
22+
# If this is a push event, we want to skip the release if there are no semantic commits
23+
# However, if this is a manual release (workflow_dispatch), then we want to disable skip-on-empty
24+
# This helps recover from forgetting to add semantic commits ('fix:', 'feat:', etc.)
25+
skip-on-empty: ${{ github.event_name == 'push' }}
26+
# docs:
27+
# # Most repos won't use this
28+
# # Depends on the 'release' job to avoid git collisions, not for any functionality reason
29+
# needs: release
30+
# secrets: inherit
31+
# if: ${{ github.ref_name == 'main' }}
32+
# uses: salesforcecli/github-workflows/.github/workflows/publishTypedoc.yml@main

‎.github/workflows/failureNotifications.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: failureNotifications
33
on:
44
workflow_run:
55
workflows:
6-
- version, tag and github release
76
- publish
7+
- create-github-release
88
types:
99
- completed
1010

@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Announce Failure
1717
id: slack
18-
uses: slackapi/slack-github-action@v1.21.0
18+
uses: slackapi/slack-github-action@v1.24.0
1919
env:
2020
# for non-CLI-team-owned plugins, you can send this anywhere you like
2121
SLACK_WEBHOOK_URL: ${{ secrets.CLI_ALERTS_SLACK_WEBHOOK }}

‎.github/workflows/manualRelease.yml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.github/workflows/notify-slack-on-pr-open.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Pull Request Slack Notification
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Notify Slack on PR open
12+
env:
13+
WEBHOOK_URL: ${{ secrets.CLI_TEAM_SLACK_WEBHOOK_URL }}
14+
PULL_REQUEST_AUTHOR_ICON_URL: ${{ github.event.pull_request.user.avatar_url }}
15+
PULL_REQUEST_AUTHOR_NAME: ${{ github.event.pull_request.user.login }}
16+
PULL_REQUEST_AUTHOR_PROFILE_URL: ${{ github.event.pull_request.user.html_url }}
17+
PULL_REQUEST_BASE_BRANCH_NAME: ${{ github.event.pull_request.base.ref }}
18+
PULL_REQUEST_COMPARE_BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
19+
PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
20+
PULL_REQUEST_REPO: ${{ github.event.pull_request.head.repo.name }}
21+
PULL_REQUEST_TITLE: ${{ github.event.pull_request.title }}
22+
PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }}
23+
uses: salesforcecli/github-workflows/.github/actions/prNotification@main

‎.github/workflows/onPushToMain.yml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/workflows/onRelease.yml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,35 @@ name: publish
22

33
on:
44
release:
5-
types: [released]
5+
# both release and prereleases
6+
types: [published]
67
# support manual release in case something goes wrong and needs to be repeated or tested
78
workflow_dispatch:
89
inputs:
910
tag:
10-
description: tag that needs to publish
11+
description: github tag that needs to publish
1112
type: string
1213
required: true
14+
1315
jobs:
16+
# parses the package.json version and detects prerelease tag (ex: beta from 4.4.4-beta.0)
17+
getDistTag:
18+
outputs:
19+
tag: ${{ steps.distTag.outputs.tag }}
20+
runs-on: ubuntu-latest
21+
steps:
22+
- uses: actions/checkout@v3
23+
with:
24+
ref: ${{ github.event.release.tag_name || inputs.tag }}
25+
- uses: salesforcecli/github-workflows/.github/actions/getPreReleaseTag@main
26+
id: distTag
27+
1428
npm:
1529
uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
30+
needs: [getDistTag]
1631
with:
1732
ctc: true
1833
sign: true
19-
tag: latest
34+
tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
2035
githubTag: ${{ github.event.release.tag_name || inputs.tag }}
2136
secrets: inherit

‎.github/workflows/slackprnotification.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# [1.3.0](https://github.com/salesforcecli/plugin-omnistudio-migration-tool/compare/1.2.52...1.3.0) (2023-11-15)
2+
3+
4+
### Features
5+
6+
* **salesforcecli:** add new workflow to support pre release ([fffc9f9](https://github.com/salesforcecli/plugin-omnistudio-migration-tool/commit/fffc9f958fa4921a232ceb26871bd0a026269562))
7+
8+
9+
110
## [1.2.52](https://github.com/salesforcecli/plugin-omnistudio-migration-tool/compare/1.2.51...1.2.52) (2023-11-12)
211

312

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@salesforce/plugin-omnistudio-migration-tool",
33
"description": "This SFDX plugin migrates FlexCard, OmniScript, DataRaptor, and Integration Procedure custom objects to standard objects.",
4-
"version": "1.2.52-beta.0",
4+
"version": "1.3.0",
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
@@ -25,7 +25,7 @@
2525
"@salesforce/plugin-command-reference": "^1.4.7",
2626
"@salesforce/prettier-config": "^0.0.3",
2727
"@salesforce/ts-sinon": "^1",
28-
"@types/jsforce": "^1.11.4",
28+
"@types/jsforce": "^1.11.5",
2929
"@typescript-eslint/eslint-plugin": "^4.2.0",
3030
"@typescript-eslint/parser": "^4.2.0",
3131
"chai": "^4.3.10",
@@ -47,7 +47,7 @@
4747
"prettier": "^2.8.8",
4848
"pretty-quick": "^3.1.0",
4949
"sinon": "10.0.0",
50-
"ts-node": "^10.0.0",
50+
"ts-node": "^10.9.2",
5151
"typescript": "^4.9.5"
5252
},
5353
"engines": {

0 commit comments

Comments
 (0)