Skip to content

Commit

Permalink
Merge branch 'Szymon-Wyrwiak/SEC-8536/pin-semgrep-image-to-sha' of ht…
Browse files Browse the repository at this point in the history
…tps://github.com/time-loop/clickup-projen into Szymon-Wyrwiak/SEC-8536/pin-semgrep-image-to-sha
  • Loading branch information
swyrwiak-cu committed Oct 2, 2023
2 parents e665f4a + 87671cd commit 9ecbb41
Show file tree
Hide file tree
Showing 12 changed files with 191 additions and 149 deletions.
4 changes: 2 additions & 2 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 45 additions & 6 deletions API.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions renovate.json5

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/clickup-ts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export module clickupTs {
entryPoints: ['./src/index.ts'],
out: project.docsDirectory,
readme: 'none',
plugin: props.html ? [] : ['typedoc-plugin-markdown'],
};
return new JsonFile(project, props.configFilePath ?? 'typedoc.json', {
obj: {
Expand Down
8 changes: 8 additions & 0 deletions src/renovate-workflow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ export module renovateWorkflow {
groupName: 'all non-major dependencies',
groupSlug: 'all-minor-patch',
matchPackagePatterns: ['*'],
excludePackagePatterns: ['^@time-loop\\/clickup-projen'],
matchUpdateTypes: ['minor', 'patch'],
// Tell renovate to enable github's auto merge feature on the PR
automerge: options.autoMergeNonBreakingUpdates ? true : undefined,
Expand All @@ -129,6 +130,13 @@ export module renovateWorkflow {
matchDepTypes: ['optionalDependencies'],
addLabels: [OPTIONAL_RENOVATE_PR_LABEL],
},
{
matchPackagePatterns: ['^@time-loop\\/clickup-projen'],
// Bypass prerelease versions:
// https://docs.renovatebot.com/configuration-options/#allowedversions
// Ex: 1.1.1 is allowed, 1.1.1-beta.0 is not allowed.
allowedVersions: '!/^[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+)?-(alpha|beta).*$/',
},
],

/* override defaults set in config:base preset */
Expand Down
16 changes: 8 additions & 8 deletions test/__snapshots__/clickup-cdk.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions test/__snapshots__/clickup-ts.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions test/__snapshots__/renovate-workflow.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions test/__snapshots__/semgrep-workflow.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9ecbb41

Please sign in to comment.