Skip to content

Commit

Permalink
Merge branch 'main' into phale/W-15760648-heap-monitor
Browse files Browse the repository at this point in the history
  • Loading branch information
peternhale authored Jun 3, 2024
2 parents 9529a73 + ea12daa commit f6a965d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/releaseWithCoreBundle.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
name: publish apex-node-bundle
on:
workflow_run:
workflows:
- version, tag and github release
- manual release
types:
- completed
workflow_dispatch:
inputs:
branch:
Expand All @@ -10,7 +16,8 @@ on:

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 }}
branch: ${{ inputs.branch || 'main'}}
2 changes: 1 addition & 1 deletion .github/workflows/testCommitExceptMain.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: unit tests
name: Unit tests
on:
push:
branches-ignore: [main]
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
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -916,9 +916,9 @@ ajv@^6.12.4:
uri-js "^4.2.2"

ajv@^8.11.0, ajv@^8.13.0:
version "8.13.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.13.0.tgz#a3939eaec9fb80d217ddf0c3376948c023f28c91"
integrity sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==
version "8.14.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.14.0.tgz#f514ddfd4756abb200e1704414963620a625ebbb"
integrity sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==
dependencies:
fast-deep-equal "^3.1.3"
json-schema-traverse "^1.0.0"
Expand Down

0 comments on commit f6a965d

Please sign in to comment.