Skip to content

Commit f1e2943

Browse files
backstage-servicegithub-actions[bot]awanlin
authored
github-actions - version:bump to v1.39.0 (#4088)
* v1.39.0 version bump * Manual changes for release Signed-off-by: Andre Wanlin <awanlin@spotify.com> --------- Signed-off-by: Andre Wanlin <awanlin@spotify.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Andre Wanlin <awanlin@spotify.com>
1 parent b5a85c1 commit f1e2943

File tree

10 files changed

+658
-1796
lines changed

10 files changed

+658
-1796
lines changed

‎workspaces/github-actions/.changeset/version-bump-1-39-0.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@backstage-community/plugin-github-actions': minor
3+
---
4+
5+
Backstage version bump to v1.39.0

‎workspaces/github-actions/backstage.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.38.1"
2+
"version": "1.39.0"
33
}

‎workspaces/github-actions/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
"directory": "workspaces/github-actions"
3737
},
3838
"devDependencies": {
39-
"@backstage/cli": "^0.32.0",
39+
"@backstage/cli": "^0.32.1",
4040
"@backstage/e2e-test-utils": "^0.1.1",
41-
"@backstage/repo-tools": "^0.13.2",
41+
"@backstage/repo-tools": "^0.13.3",
4242
"@changesets/cli": "^2.27.1",
4343
"knip": "^5.27.4",
4444
"node-gyp": "^10.0.0",

‎workspaces/github-actions/packages/app-next/package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
},
2121
"dependencies": {
2222
"@backstage-community/plugin-github-actions": "workspace:^",
23-
"@backstage/app-defaults": "^1.6.1",
24-
"@backstage/catalog-model": "^1.7.3",
25-
"@backstage/cli": "^0.32.0",
26-
"@backstage/core-app-api": "^1.16.1",
27-
"@backstage/core-compat-api": "^0.4.1",
28-
"@backstage/core-components": "^0.17.1",
29-
"@backstage/core-plugin-api": "^1.10.6",
30-
"@backstage/frontend-app-api": "^0.11.1",
31-
"@backstage/frontend-defaults": "^0.2.1",
32-
"@backstage/frontend-plugin-api": "^0.10.1",
33-
"@backstage/integration-react": "^1.2.6",
34-
"@backstage/plugin-api-docs": "^0.12.6",
35-
"@backstage/plugin-catalog": "^1.29.0",
36-
"@backstage/plugin-catalog-common": "^1.1.3",
37-
"@backstage/plugin-catalog-graph": "^0.4.18",
38-
"@backstage/plugin-catalog-import": "^0.12.13",
39-
"@backstage/plugin-catalog-react": "^1.17.0",
40-
"@backstage/plugin-org": "^0.6.38",
41-
"@backstage/plugin-user-settings": "^0.8.21",
42-
"@backstage/theme": "^0.6.5",
23+
"@backstage/app-defaults": "^1.6.2",
24+
"@backstage/catalog-model": "^1.7.4",
25+
"@backstage/cli": "^0.32.1",
26+
"@backstage/core-app-api": "^1.17.0",
27+
"@backstage/core-compat-api": "^0.4.2",
28+
"@backstage/core-components": "^0.17.2",
29+
"@backstage/core-plugin-api": "^1.10.7",
30+
"@backstage/frontend-app-api": "^0.11.2",
31+
"@backstage/frontend-defaults": "^0.2.2",
32+
"@backstage/frontend-plugin-api": "^0.10.2",
33+
"@backstage/integration-react": "^1.2.7",
34+
"@backstage/plugin-api-docs": "^0.12.7",
35+
"@backstage/plugin-catalog": "^1.30.0",
36+
"@backstage/plugin-catalog-common": "^1.1.4",
37+
"@backstage/plugin-catalog-graph": "^0.4.19",
38+
"@backstage/plugin-catalog-import": "^0.13.0",
39+
"@backstage/plugin-catalog-react": "^1.18.0",
40+
"@backstage/plugin-org": "^0.6.39",
41+
"@backstage/plugin-user-settings": "^0.8.22",
42+
"@backstage/theme": "^0.6.6",
4343
"@material-ui/core": "^4.12.2",
4444
"@material-ui/icons": "^4.9.1",
4545
"history": "^5.0.0",
@@ -51,7 +51,7 @@
5151
"styled-components": "^6.1.8"
5252
},
5353
"devDependencies": {
54-
"@backstage/test-utils": "^1.7.7",
54+
"@backstage/test-utils": "^1.7.8",
5555
"@playwright/test": "^1.32.3",
5656
"@testing-library/dom": "^9.0.0",
5757
"@testing-library/jest-dom": "^6.0.0",

‎workspaces/github-actions/packages/app/package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@
2020
},
2121
"dependencies": {
2222
"@backstage-community/plugin-github-actions": "workspace:^",
23-
"@backstage/app-defaults": "^1.6.1",
24-
"@backstage/catalog-model": "^1.7.3",
25-
"@backstage/cli": "^0.32.0",
26-
"@backstage/core-app-api": "^1.16.1",
27-
"@backstage/core-components": "^0.17.1",
28-
"@backstage/core-plugin-api": "^1.10.6",
29-
"@backstage/integration-react": "^1.2.6",
30-
"@backstage/plugin-api-docs": "^0.12.6",
31-
"@backstage/plugin-catalog": "^1.29.0",
32-
"@backstage/plugin-catalog-common": "^1.1.3",
33-
"@backstage/plugin-catalog-graph": "^0.4.18",
34-
"@backstage/plugin-catalog-import": "^0.12.13",
35-
"@backstage/plugin-catalog-react": "^1.17.0",
36-
"@backstage/plugin-org": "^0.6.38",
37-
"@backstage/plugin-permission-react": "^0.4.33",
38-
"@backstage/plugin-user-settings": "^0.8.21",
39-
"@backstage/theme": "^0.6.5",
23+
"@backstage/app-defaults": "^1.6.2",
24+
"@backstage/catalog-model": "^1.7.4",
25+
"@backstage/cli": "^0.32.1",
26+
"@backstage/core-app-api": "^1.17.0",
27+
"@backstage/core-components": "^0.17.2",
28+
"@backstage/core-plugin-api": "^1.10.7",
29+
"@backstage/integration-react": "^1.2.7",
30+
"@backstage/plugin-api-docs": "^0.12.7",
31+
"@backstage/plugin-catalog": "^1.30.0",
32+
"@backstage/plugin-catalog-common": "^1.1.4",
33+
"@backstage/plugin-catalog-graph": "^0.4.19",
34+
"@backstage/plugin-catalog-import": "^0.13.0",
35+
"@backstage/plugin-catalog-react": "^1.18.0",
36+
"@backstage/plugin-org": "^0.6.39",
37+
"@backstage/plugin-permission-react": "^0.4.34",
38+
"@backstage/plugin-user-settings": "^0.8.22",
39+
"@backstage/theme": "^0.6.6",
4040
"@material-ui/core": "^4.12.2",
4141
"@material-ui/icons": "^4.9.1",
4242
"history": "^5.0.0",
@@ -47,7 +47,7 @@
4747
"react-use": "^17.2.4"
4848
},
4949
"devDependencies": {
50-
"@backstage/test-utils": "^1.7.7",
50+
"@backstage/test-utils": "^1.7.8",
5151
"@playwright/test": "^1.32.3",
5252
"@testing-library/dom": "^9.0.0",
5353
"@testing-library/jest-dom": "^6.0.0",

‎workspaces/github-actions/packages/backend/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
2222
},
2323
"dependencies": {
24-
"@backstage/backend-defaults": "^0.9.0",
25-
"@backstage/backend-plugin-api": "^1.3.0",
26-
"@backstage/catalog-model": "^1.7.3",
24+
"@backstage/backend-defaults": "^0.10.0",
25+
"@backstage/backend-plugin-api": "^1.3.1",
26+
"@backstage/catalog-model": "^1.7.4",
2727
"@backstage/config": "^1.3.2",
28-
"@backstage/plugin-app-backend": "^0.5.1",
29-
"@backstage/plugin-auth-backend": "^0.24.5",
30-
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.2",
31-
"@backstage/plugin-auth-node": "^0.6.2",
32-
"@backstage/plugin-catalog-backend": "^1.32.1",
33-
"@backstage/plugin-proxy-backend": "^0.6.1",
28+
"@backstage/plugin-app-backend": "^0.5.2",
29+
"@backstage/plugin-auth-backend": "^0.25.0",
30+
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.3",
31+
"@backstage/plugin-auth-node": "^0.6.3",
32+
"@backstage/plugin-catalog-backend": "^2.0.0",
33+
"@backstage/plugin-proxy-backend": "^0.6.2",
3434
"app": "link:../app",
3535
"better-sqlite3": "^9.0.0",
3636
"dockerode": "^3.3.1",
@@ -39,7 +39,7 @@
3939
"winston": "^3.2.1"
4040
},
4141
"devDependencies": {
42-
"@backstage/cli": "^0.32.0",
42+
"@backstage/cli": "^0.32.1",
4343
"@types/dockerode": "^3.3.0",
4444
"@types/express": "^4.17.6",
4545
"@types/express-serve-static-core": "^4.17.5",

‎workspaces/github-actions/packages/backend/src/modules/auth/issueToken.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
stringifyEntityRef,
1919
DEFAULT_NAMESPACE,
2020
} from '@backstage/catalog-model';
21-
import { getDefaultOwnershipEntityRefs } from '@backstage/plugin-auth-backend';
21+
2222
import { AuthResolverContext } from '@backstage/plugin-auth-node';
2323

2424
export const issueToken = async (
@@ -37,7 +37,8 @@ export const issueToken = async (
3737
},
3838
});
3939
entity = result.entity;
40-
membership = getDefaultOwnershipEntityRefs(result.entity);
40+
membership = (await ctx.resolveOwnershipEntityRefs(result.entity))
41+
.ownershipEntityRefs;
4142
} catch (e) {
4243
// ignored; no catalog user, proceed with empty membership
4344
}

‎workspaces/github-actions/plugins/github-actions/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
"test": "backstage-cli package test"
5656
},
5757
"dependencies": {
58-
"@backstage/catalog-model": "^1.7.3",
59-
"@backstage/core-compat-api": "^0.4.1",
60-
"@backstage/core-components": "^0.17.1",
61-
"@backstage/core-plugin-api": "^1.10.6",
62-
"@backstage/frontend-plugin-api": "^0.10.1",
63-
"@backstage/integration": "^1.16.3",
64-
"@backstage/integration-react": "^1.2.6",
65-
"@backstage/plugin-catalog-react": "^1.17.0",
58+
"@backstage/catalog-model": "^1.7.4",
59+
"@backstage/core-compat-api": "^0.4.2",
60+
"@backstage/core-components": "^0.17.2",
61+
"@backstage/core-plugin-api": "^1.10.7",
62+
"@backstage/frontend-plugin-api": "^0.10.2",
63+
"@backstage/integration": "^1.17.0",
64+
"@backstage/integration-react": "^1.2.7",
65+
"@backstage/plugin-catalog-react": "^1.18.0",
6666
"@material-ui/core": "^4.12.2",
6767
"@material-ui/icons": "^4.9.1",
6868
"@material-ui/lab": "4.0.0-alpha.61",
@@ -73,11 +73,11 @@
7373
"react-use": "^17.2.4"
7474
},
7575
"devDependencies": {
76-
"@backstage/cli": "^0.32.0",
77-
"@backstage/core-app-api": "^1.16.1",
78-
"@backstage/dev-utils": "^1.1.9",
79-
"@backstage/frontend-test-utils": "^0.3.1",
80-
"@backstage/test-utils": "^1.7.7",
76+
"@backstage/cli": "^0.32.1",
77+
"@backstage/core-app-api": "^1.17.0",
78+
"@backstage/dev-utils": "^1.1.10",
79+
"@backstage/frontend-test-utils": "^0.3.2",
80+
"@backstage/test-utils": "^1.7.8",
8181
"@testing-library/dom": "^10.0.0",
8282
"@testing-library/jest-dom": "^6.0.0",
8383
"@testing-library/react": "^15.0.0",

‎workspaces/github-actions/plugins/github-actions/report-alpha.api.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { AnyApiFactory } from '@backstage/core-plugin-api';
99
import { AnyExtensionDataRef } from '@backstage/frontend-plugin-api';
1010
import { AnyRouteRefParams } from '@backstage/frontend-plugin-api';
1111
import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
12-
import { Entity } from '@backstage/catalog-model/index';
12+
import { Entity } from '@backstage/catalog-model';
1313
import { EntityCardType } from '@backstage/plugin-catalog-react/alpha';
1414
import { EntityPredicate } from '@backstage/plugin-catalog-react/alpha';
1515
import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
@@ -25,7 +25,7 @@ const _default: FrontendPlugin<
2525
},
2626
{},
2727
{
28-
'api:github-actions': ExtensionDefinition<{
28+
[x: `api:${string}`]: ExtensionDefinition<{
2929
kind: 'api';
3030
name: undefined;
3131
config: {};
@@ -40,7 +40,9 @@ const _default: FrontendPlugin<
4040
factory: AnyApiFactory;
4141
};
4242
}>;
43-
'entity-card:github-actions/latest-branch-workflow-runs': ExtensionDefinition<{
43+
[
44+
x: `entity-card:${string}/latest-branch-workflow-runs`
45+
]: ExtensionDefinition<{
4446
config: {
4547
props: {
4648
branch: string;
@@ -99,7 +101,7 @@ const _default: FrontendPlugin<
99101
type?: EntityCardType | undefined;
100102
};
101103
}>;
102-
'entity-card:github-actions/latest-workflow-run': ExtensionDefinition<{
104+
[x: `entity-card:${string}/latest-workflow-run`]: ExtensionDefinition<{
103105
config: {
104106
props: {
105107
branch: string;
@@ -158,7 +160,7 @@ const _default: FrontendPlugin<
158160
type?: EntityCardType | undefined;
159161
};
160162
}>;
161-
'entity-card:github-actions/recent-workflow-runs': ExtensionDefinition<{
163+
[x: `entity-card:${string}/recent-workflow-runs`]: ExtensionDefinition<{
162164
config: {
163165
props: {
164166
dense: boolean;
@@ -221,7 +223,7 @@ const _default: FrontendPlugin<
221223
type?: EntityCardType | undefined;
222224
};
223225
}>;
224-
'entity-card:github-actions/workflow-runs': ExtensionDefinition<{
226+
[x: `entity-card:${string}/workflow-runs`]: ExtensionDefinition<{
225227
kind: 'entity-card';
226228
name: 'workflow-runs';
227229
config: {
@@ -262,7 +264,7 @@ const _default: FrontendPlugin<
262264
type?: EntityCardType | undefined;
263265
};
264266
}>;
265-
'entity-content:github-actions/entity': ExtensionDefinition<{
267+
[x: `entity-content:${string}/entity`]: ExtensionDefinition<{
266268
kind: 'entity-content';
267269
name: 'entity';
268270
config: {

0 commit comments

Comments
 (0)