Skip to content

Commit

Permalink
Merge branch 'main' of github.com:SFDO-Tooling/CumulusCI into feature…
Browse files Browse the repository at this point in the history
…/wait-until-modal-timeout
  • Loading branch information
leboff committed May 20, 2024
2 parents d6a7306 + fe6e81c commit 1803ad2
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/feature_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
lint:
name: Lint
if: ${{ github.event_name == 'pull_request' }}
if: ${{ contains(fromJSON('["workflow_dispatch", "pull_request"]'), github.event_name) }}
uses: SFDO-Tooling/.github/.github/workflows/pre-commit.yml@main
docs:
name: Build Docs
Expand Down
2 changes: 1 addition & 1 deletion cumulusci/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.86.1"
__version__ = "3.87.0"
4 changes: 1 addition & 3 deletions cumulusci/tasks/create_package_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,7 @@ def _run_task(self):
package_zip_builder = None
with convert_sfdx_source(
self.project_config.default_package_path,
None
if self.package_config.package_type == PackageTypeEnum.unlocked
else self.package_config.package_name,
None,
self.logger,
) as path:
package_zip_builder = MetadataPackageZipBuilder(
Expand Down
4 changes: 3 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,9 @@
"index",
"cumulusci.tex",
"CumulusCI Documentation",
"Cumulus Suite Development Team",
"""Kamalnath Devarakonda\\\\
Sr Director Software Engineering\\\\
[email protected]""",
"manual",
)
]
Expand Down
20 changes: 18 additions & 2 deletions docs/history.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,30 @@

<!-- latest-start -->

## v3.86.1 (2024-05-06)
## v3.87.0 (2024-05-17)

<!-- Release notes generated using configuration in .github/release.yml at main -->

**Full Changelog**: https://github.com/SFDO-Tooling/CumulusCI/compare/v3.86.0...v3.86.1
## What's Changed

### Changes 🎉

- Don't add fullname tag in 2GP package.xml by [@leboff](https://github.com/leboff) in [#3748](https://github.com/SFDO-Tooling/CumulusCI/pull/3748)

## New Contributors

- @leboff made their first contribution in [#3748](https://github.com/SFDO-Tooling/CumulusCI/pull/3748)

**Full Changelog**: https://github.com/SFDO-Tooling/CumulusCI/compare/v3.86.1...v3.87.0

<!-- latest-stop -->

## v3.86.1 (2024-05-06)

<!-- Release notes generated using configuration in .github/release.yml at main -->

**Full Changelog**: https://github.com/SFDO-Tooling/CumulusCI/compare/v3.86.0...v3.86.1

## v3.86.0 (2024-03-27)

<!-- Release notes generated using configuration in .github/release.yml at main -->
Expand Down

0 comments on commit 1803ad2

Please sign in to comment.