Skip to content

Commit 1ca0a10

Browse files
cockpit: use upstream cockpit types
Since we've made our typescript checks stricter, we can rely on the cockpit types from upstream. This will prevent drift between the types. The one downside to this is that we may have to keep the some of the cockpit lib files and make sure they match the commit hash in the makefile.
1 parent 21629f6 commit 1ca0a10

22 files changed

+2424
-36
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ cockpit/public/main*
3838
.sentryclirc
3939

4040
# cockpit lib dir
41-
pkg/lib
41+
pkg/lib/*
42+
!pkg/lib/cockpit/
43+
!pkg/lib/cockpit.d.ts
44+
!pkg/lib/os-release.ts
4245

4346
rpmbuild
4447

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ VERSION := $(shell (cd "$(SRCDIR)" && grep "^Version:" cockpit/$(PACKAGE_NAME).s
77
COMMIT = $(shell (cd "$(SRCDIR)" && git rev-parse HEAD))
88

99
# TODO: figure out a strategy for keeping this updated
10-
COCKPIT_REPO_COMMIT = a70142a7a6f9c4e78e71f3c4ec738b6db2fbb04f
10+
COCKPIT_REPO_COMMIT = 0ee23c07488e343e04ec766a891d1fceea781d10
1111
COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
1212
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
1313

0 commit comments

Comments
 (0)