Skip to content

Commit

Permalink
Merge branch 'main' into feat/gleam-enable-update-locked
Browse files Browse the repository at this point in the history
  • Loading branch information
SnakeDoc authored Nov 22, 2024
2 parents c1399a5 + 021db4b commit 064dccf
Show file tree
Hide file tree
Showing 8 changed files with 158 additions and 160 deletions.
8 changes: 8 additions & 0 deletions lib/modules/manager/asdf/extract.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ php 8.1.12
pnpm 7.26.2
poetry 1.3.2
pre-commit 3.3.1
protoc 28.3
pulumi 3.57.1
python 3.11.0
rebar 3.23.0
Expand Down Expand Up @@ -559,6 +560,13 @@ dummy 1.2.3
depName: 'pre-commit',
extractVersion: '^v(?<version>.+)',
},
{
currentValue: '28.3',
datasource: 'github-releases',
packageName: 'protocolbuffers/protobuf',
depName: 'protoc',
extractVersion: '^v(?<version>\\S+)',
},
{
currentValue: '3.57.1',
datasource: 'github-releases',
Expand Down
8 changes: 8 additions & 0 deletions lib/modules/manager/asdf/upgradeable-tooling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,14 @@ export const upgradeableTooling: Record<string, ToolingDefinition> = {
extractVersion: '^v(?<version>.+)',
},
},
protoc: {
asdfPluginUrl: '/~https://github.com/paxosglobal/asdf-protoc.git',
config: {
datasource: GithubReleasesDatasource.id,
packageName: 'protocolbuffers/protobuf',
extractVersion: '^v(?<version>\\S+)',
},
},
pulumi: {
asdfPluginUrl: '/~https://github.com/canha/asdf-pulumi.git',
config: {
Expand Down
62 changes: 0 additions & 62 deletions lib/modules/platform/gitlab/__snapshots__/index.spec.ts.snap
Original file line number Diff line number Diff line change
@@ -1,67 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`modules/platform/gitlab/index createPr(branchName, title, body) raises with squash enabled when repository squash option is always 1`] = `
{
"id": 1,
"iid": 12345,
"number": 12345,
"sourceBranch": "some-branch",
"title": "some title",
}
`;

exports[`modules/platform/gitlab/index createPr(branchName, title, body) raises with squash enabled when repository squash option is default_on 1`] = `
{
"id": 1,
"iid": 12345,
"number": 12345,
"sourceBranch": "some-branch",
"title": "some title",
}
`;

exports[`modules/platform/gitlab/index createPr(branchName, title, body) returns the PR 1`] = `
{
"id": 1,
"iid": 12345,
"number": 12345,
"sourceBranch": "some-branch",
"title": "some title",
}
`;

exports[`modules/platform/gitlab/index createPr(branchName, title, body) supports draftPR on < 13.2 1`] = `
{
"id": 1,
"iid": 12345,
"isDraft": true,
"number": 12345,
"sourceBranch": "some-branch",
"title": "some title",
}
`;

exports[`modules/platform/gitlab/index createPr(branchName, title, body) supports draftPR on >= 13.2 1`] = `
{
"id": 1,
"iid": 12345,
"isDraft": true,
"number": 12345,
"sourceBranch": "some-branch",
"title": "some title",
}
`;

exports[`modules/platform/gitlab/index createPr(branchName, title, body) uses default branch 1`] = `
{
"id": 1,
"iid": 12345,
"number": 12345,
"sourceBranch": "some-branch",
"title": "some title",
}
`;

exports[`modules/platform/gitlab/index getBranchPr(branchName) should return the PR object 1`] = `
{
"bodyStruct": {
Expand Down
Loading

0 comments on commit 064dccf

Please sign in to comment.