Skip to content

Commit

Permalink
Merge branch 'main' into CODEOWNERS_Asterisk_Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
peternhale authored Jun 7, 2024
2 parents 8dc2fab + db21420 commit 04ebbee
Show file tree
Hide file tree
Showing 28 changed files with 2,747 additions and 2,327 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ NOTICE: While GitHub is the preferred channel for reporting issues/feedback, thi
-->

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

### Summary
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ runs:
using: composite
steps:
- uses: './.github/actions/gh-config'
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: latest
cache: 'yarn'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manualRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.IDEE_GH_TOKEN }}
- name: Conventional Changelog Action
Expand All @@ -22,7 +22,7 @@ jobs:
# always do the release, even if there are no semantic commits
skip-on-empty: false
tag-prefix: ''
- uses: notiz-dev/github-action-json-property@2192e246737701f108a4571462b76c75e7376216
- uses: notiz-dev/github-action-json-property@7a701887f4b568b23eb7b78bb0fc49aaeb1b68d3
id: packageVersion
with:
path: 'package.json'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/onPushToMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ on:

jobs:
release:
uses: salesforcecli/github-workflows/.github/workflows/githubRelease.yml@gbockus/updateReleaseToIncludeTokenInput
uses: salesforcecli/github-workflows/.github/workflows/githubRelease.yml@main
secrets:
ALT_GITHUB_TOKEN: ${{ secrets.IDEE_GH_TOKEN }}
SVC_CLI_BOT_GITHUB_TOKEN: ${{ secrets.IDEE_GH_TOKEN }}
22 changes: 17 additions & 5 deletions .github/workflows/onRelease.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
name: On Release
name: publish

# when a github release happens, publish an npm package,
on:
release:
types: [released]
# support manual release
types: [published]
# support manual release in case something goes wrong and needs to be repeated or tested
workflow_dispatch:
inputs:
tag:
description: tag that needs to publish
type: string
required: true
jobs:
# parses the package.json version and detects prerelease tag (ex: beta from 4.4.4-beta.0)
getDistTag:
outputs:
tag: ${{ steps.distTag.outputs.tag }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.release.tag_name || inputs.tag }}
- uses: salesforcecli/github-workflows/.github/actions/getPreReleaseTag@main
id: distTag

npm:
uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
needs: [getDistTag]
with:
ctc: false
tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
githubTag: ${{ github.event.release.tag_name || inputs.tag }}
secrets: inherit
22 changes: 22 additions & 0 deletions .github/workflows/releaseWithCoreBundle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: publish templates-bundle
on:
workflow_run:
workflows:
- publish
types:
- completed
workflow_dispatch:
inputs:
branch:
description: 'Set the branch to use for release'
type: string
required: false
default: 'main'

jobs:
call-release-workflow:
if: ${{ inputs.branch || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')}}
uses: forcedotcom/bundle-publish-scripts/.github/workflows/releaseWithCoreBundle.yml@main
secrets: inherit
with:
branch: ${{ inputs.branch || 'main'}}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Failure Notification
name: Slack Notification

on:
workflow_run:
Expand All @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Announce result
uses: slackapi/slack-github-action@v1.22.0
uses: slackapi/slack-github-action@v1.24.0
with:
payload: |
{
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/testWithCoreBundle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Test With Core Bundle
on:
push:
branches-ignore: [main]

jobs:
build-and-test:
uses: forcedotcom/bundle-publish-scripts/.github/workflows/validateBundleForDependents.yml@main
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/unitTestsLinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node_version }}
cache: yarn
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unitTestsWindows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- name: Git config check for carriage returns
run: git config --global core.autocrlf false
shell: bash
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node_version }}
cache: yarn
Expand Down
3 changes: 2 additions & 1 deletion .mocharc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"require": "ts-node/register,source-map-support/register",
"require": ["ts-node/register"],
"watch-extensions": "ts",
"watch-files": ["src/**/*.ts", "test/**/*.ts"],
"recursive": true,
"reporter": "spec",
"timeout": 5000
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.13
v18.18
Loading

0 comments on commit 04ebbee

Please sign in to comment.