refactor(ci): reserve the removed storage fields and type the cancel reason

The storage schema marks the field numbers it dropped as reserved, and the
cancel reason of a job is an enum with an explicit mapping instead of an index
into a slice. The comment of the event stream names the live log feed.

commit: 6d7ddbac1cb5ce5a4753e1988ddbaf40b49342be
author: brice · 10d ago · 2026-10-12 19:22 UTC
parent: 916e849
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

5 files · +174 -58

M gen/ermite/storage/ci.pb.go +110 -49


@@ -316,6 +316,59 @@ func (CIIsolation) EnumDescriptor() ([]byte, []int) {
316	316		return file_ermite_storage_ci_proto_rawDescGZIP(), []int{4}
317	317		}
318	318
	319	+	// CICancelReason says why a job is asked to stop.
	320	+	type CICancelReason int32
	321	+
	322	+	const (
	323	+	CICancelReason_CI_CANCEL_REASON_UNSPECIFIED CICancelReason = 0
	324	+	CICancelReason_CI_CANCEL_REASON_USER CICancelReason = 1
	325	+	CICancelReason_CI_CANCEL_REASON_FAIL_FAST CICancelReason = 2
	326	+	CICancelReason_CI_CANCEL_REASON_TIMEOUT CICancelReason = 3
	327	+	)
	328	+
	329	+	// Enum value maps for CICancelReason.
	330	+	var (
	331	+	CICancelReason_name = map[int32]string{
	332	+	0: "CI_CANCEL_REASON_UNSPECIFIED",
	333	+	1: "CI_CANCEL_REASON_USER",
	334	+	2: "CI_CANCEL_REASON_FAIL_FAST",
	335	+	3: "CI_CANCEL_REASON_TIMEOUT",
	336	+	}
	337	+	CICancelReason_value = map[string]int32{
	338	+	"CI_CANCEL_REASON_UNSPECIFIED": 0,
	339	+	"CI_CANCEL_REASON_USER": 1,
	340	+	"CI_CANCEL_REASON_FAIL_FAST": 2,
	341	+	"CI_CANCEL_REASON_TIMEOUT": 3,
	342	+	}
	343	+	)
	344	+
	345	+	func (x CICancelReason) Enum() *CICancelReason {
	346	+	p := new(CICancelReason)
	347	+	*p = x
	348	+	return p
	349	+	}
	350	+
	351	+	func (x CICancelReason) String() string {
	352	+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
	353	+	}
	354	+
	355	+	func (CICancelReason) Descriptor() protoreflect.EnumDescriptor {
	356	+	return file_ermite_storage_ci_proto_enumTypes[5].Descriptor()
	357	+	}
	358	+
	359	+	func (CICancelReason) Type() protoreflect.EnumType {
	360	+	return &file_ermite_storage_ci_proto_enumTypes[5]
	361	+	}
	362	+
	363	+	func (x CICancelReason) Number() protoreflect.EnumNumber {
	364	+	return protoreflect.EnumNumber(x)
	365	+	}
	366	+
	367	+	// Deprecated: Use CICancelReason.Descriptor instead.
	368	+	func (CICancelReason) EnumDescriptor() ([]byte, []int) {
	369	+	return file_ermite_storage_ci_proto_rawDescGZIP(), []int{5}
	370	+	}
	371	+
319	372		// CIRun is stored under "run/<repo>/<id:020d>".
320	373		type CIRun struct {
321	374		state protoimpl.MessageState `protogen:"open.v1"`

@@ -722,7 +775,7 @@ type CIJob struct {
722	775		AckedAt *timestamppb.Timestamp `protobuf:"bytes,30,opt,name=acked_at,json=ackedAt,proto3" json:"acked_at,omitempty"`
723	776		AssignCancels int32 `protobuf:"varint,31,opt,name=assign_cancels,json=assignCancels,proto3" json:"assign_cancels,omitempty"`
724	777		TokenValidUntil *timestamppb.Timestamp `protobuf:"bytes,32,opt,name=token_valid_until,json=tokenValidUntil,proto3" json:"token_valid_until,omitempty"`
725		-	CancelReason int32 `protobuf:"varint,33,opt,name=cancel_reason,json=cancelReason,proto3" json:"cancel_reason,omitempty"`
	778	+	CancelReason CICancelReason `protobuf:"varint,33,opt,name=cancel_reason,json=cancelReason,proto3,enum=ermite.storage.CICancelReason" json:"cancel_reason,omitempty"`
726	779		CancelMessage string `protobuf:"bytes,34,opt,name=cancel_message,json=cancelMessage,proto3" json:"cancel_message,omitempty"`
727	780		CancelRequestedAt *timestamppb.Timestamp `protobuf:"bytes,35,opt,name=cancel_requested_at,json=cancelRequestedAt,proto3" json:"cancel_requested_at,omitempty"`
728	781		// Set when the job is planned: runs-on, name and contexts are evaluated.

@@ -992,11 +1045,11 @@ func (x CIJob) GetTokenValidUntil() timestamppb.Timestamp {
992	1045		return nil
993	1046		}
994	1047
995		-	func (x *CIJob) GetCancelReason() int32 {
	1048	+	func (x *CIJob) GetCancelReason() CICancelReason {
996	1049		if x != nil {
997	1050		return x.CancelReason
998	1051		}
999		-	return 0
	1052	+	return CICancelReason_CI_CANCEL_REASON_UNSPECIFIED
1000	1053		}
1001	1054
1002	1055		func (x *CIJob) GetCancelMessage() string {

@@ -1289,7 +1342,7 @@ var File_ermite_storage_ci_proto protoreflect.FileDescriptor
1289	1342
1290	1343		const file_ermite_storage_ci_proto_rawDesc = "" +
1291	1344		"\n" +
1292		-	"\x17ermite/storage/ci.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\xbf\x05\n" +
	1345	+	"\x17ermite/storage/ci.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\xcb\x05\n" +
1293	1346		"\x05CIRun\x12\x12\n" +
1294	1347		"\x04repo\x18\x01 \x01(\tR\x04repo\x12\x0e\n" +
1295	1348		"\x02id\x18\x02 \x01(\x03R\x02id\x12\x16\n" +

@@ -1314,13 +1367,13 @@ const file_ermite_storage_ci_proto_rawDesc = "" +
1314	1367		"started_at\x18\x10 \x01(\v2\x1a.google.protobuf.TimestampR\tstartedAt\x12=\n" +
1315	1368		"\fcompleted_at\x18\x11 \x01(\v2\x1a.google.protobuf.TimestampR\vcompletedAt\x12)\n" +
1316	1369		"\x10cancel_requested\x18\x14 \x01(\bR\x0fcancelRequested\x12J\n" +
1317		-	"\x13cancel_requested_at\x18\x15 \x01(\v2\x1a.google.protobuf.TimestampR\x11cancelRequestedAt\"~\n" +
	1370	+	"\x13cancel_requested_at\x18\x15 \x01(\v2\x1a.google.protobuf.TimestampR\x11cancelRequestedAtJ\x04\b\x12\x10\x13J\x04\b\x13\x10\x14\"~\n" +
1318	1371		"\vCIRunSource\x12\x15\n" +
1319	1372		"\x06run_id\x18\x04 \x01(\x03R\x05runId\x12#\n" +
1320	1373		"\rworkflow_yaml\x18\x01 \x01(\tR\fworkflowYaml\x12\x1f\n" +
1321	1374		"\vgithub_json\x18\x02 \x01(\tR\n" +
1322	1375		"githubJson\x12\x12\n" +
1323		-	"\x04repo\x18\x03 \x01(\tR\x04repo\"\xd9\x02\n" +
	1376	+	"\x04repo\x18\x03 \x01(\tR\x04repo\"\xe5\x02\n" +
1324	1377		"\x06CIStep\x12\x16\n" +
1325	1378		"\x06number\x18\x01 \x01(\x05R\x06number\x12\x12\n" +
1326	1379		"\x04name\x18\x02 \x01(\tR\x04name\x121\n" +

@@ -1332,7 +1385,8 @@ const file_ermite_storage_ci_proto_rawDesc = "" +
1332	1385		"started_at\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\tstartedAt\x12=\n" +
1333	1386		"\fcompleted_at\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\vcompletedAt\x12\x1b\n" +
1334	1387		"\tlog_start\x18\a \x01(\x03R\blogStart\x12\x1b\n" +
1335		-	"\thas_lines\x18\t \x01(\bR\bhasLines\"\x94\f\n" +
	1388	+	"\thas_lines\x18\t \x01(\bR\bhasLinesJ\x04\b\b\x10\tJ\x04\b\n" +
	1389	+	"\x10\v\"\xba\f\n" +
1336	1390		"\x05CIJob\x12\x0e\n" +
1337	1391		"\x02id\x18\x01 \x01(\tR\x02id\x12\x15\n" +
1338	1392		"\x06run_id\x18\x02 \x01(\x03R\x05runId\x12\x18\n" +

@@ -1375,8 +1429,8 @@ const file_ermite_storage_ci_proto_rawDesc = "" +
1375	1429		"assignedAt\x125\n" +
1376	1430		"\backed_at\x18\x1e \x01(\v2\x1a.google.protobuf.TimestampR\aackedAt\x12%\n" +
1377	1431		"\x0eassign_cancels\x18\x1f \x01(\x05R\rassignCancels\x12F\n" +
1378		-	"\x11token_valid_until\x18 \x01(\v2\x1a.google.protobuf.TimestampR\x0ftokenValidUntil\x12#\n" +
1379		-	"\rcancel_reason\x18! \x01(\x05R\fcancelReason\x12%\n" +
	1432	+	"\x11token_valid_until\x18 \x01(\v2\x1a.google.protobuf.TimestampR\x0ftokenValidUntil\x12C\n" +
	1433	+	"\rcancel_reason\x18! \x01(\x0e2\x1e.ermite.storage.CICancelReasonR\fcancelReason\x12%\n" +
1380	1434		"\x0ecancel_message\x18\" \x01(\tR\rcancelMessage\x12J\n" +
1381	1435		"\x13cancel_requested_at\x18# \x01(\v2\x1a.google.protobuf.TimestampR\x11cancelRequestedAt\x12\x18\n" +
1382	1436		"\aplanned\x18% \x01(\bR\aplanned\x12\x1f\n" +

@@ -1385,7 +1439,7 @@ const file_ermite_storage_ci_proto_rawDesc = "" +
1385	1439		"\rcontexts_json\x18' \x01(\tR\fcontextsJson\x1a:\n" +
1386	1440		"\fOutputsEntry\x12\x10\n" +
1387	1441		"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
1388		-	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xe5\x03\n" +
	1442	+	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01J\x04\b$\x10%\"\xe5\x03\n" +
1389	1443		"\aCICheck\x12\x0e\n" +
1390	1444		"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
1391	1445		"\x04repo\x18\x02 \x01(\tR\x04repo\x12\x10\n" +

@@ -1447,7 +1501,12 @@ const file_ermite_storage_ci_proto_rawDesc = "" +
1447	1501		"\x18CI_ISOLATION_UNSPECIFIED\x10\x00\x12\x13\n" +
1448	1502		"\x0fCI_ISOLATION_VM\x10\x01\x12!\n" +
1449	1503		"\x1dCI_ISOLATION_CONTAINER_SYSBOX\x10\x02\x12%\n" +
1450		-	"!CI_ISOLATION_CONTAINER_PRIVILEGED\x10\x03B/Z-bnema.dev/ermite/gen/ermite/storage;storagepbb\x06proto3"
	1504	+	"!CI_ISOLATION_CONTAINER_PRIVILEGED\x10\x03*\x8b\x01\n" +
	1505	+	"\x0eCICancelReason\x12 \n" +
	1506	+	"\x1cCI_CANCEL_REASON_UNSPECIFIED\x10\x00\x12\x19\n" +
	1507	+	"\x15CI_CANCEL_REASON_USER\x10\x01\x12\x1e\n" +
	1508	+	"\x1aCI_CANCEL_REASON_FAIL_FAST\x10\x02\x12\x1c\n" +
	1509	+	"\x18CI_CANCEL_REASON_TIMEOUT\x10\x03B/Z-bnema.dev/ermite/gen/ermite/storage;storagepbb\x06proto3"
1451	1510
1452	1511		var (
1453	1512		file_ermite_storage_ci_proto_rawDescOnce sync.Once

@@ -1461,7 +1520,7 @@ func file_ermite_storage_ci_proto_rawDescGZIP() []byte {
1461	1520		return file_ermite_storage_ci_proto_rawDescData
1462	1521		}
1463	1522
1464		-	var file_ermite_storage_ci_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
	1523	+	var file_ermite_storage_ci_proto_enumTypes = make([]protoimpl.EnumInfo, 6)
1465	1524		var file_ermite_storage_ci_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
1466	1525		var file_ermite_storage_ci_proto_goTypes = []any{
1467	1526		(CIStatus)(0), // 0: ermite.storage.CIStatus

@@ -1469,51 +1528,53 @@ var file_ermite_storage_ci_proto_goTypes = []any{
1469	1528		(CIStepState)(0), // 2: ermite.storage.CIStepState
1470	1529		(CIJobPhase)(0), // 3: ermite.storage.CIJobPhase
1471	1530		(CIIsolation)(0), // 4: ermite.storage.CIIsolation
1472		-	(*CIRun)(nil), // 5: ermite.storage.CIRun
1473		-	(*CIRunSource)(nil), // 6: ermite.storage.CIRunSource
1474		-	(*CIStep)(nil), // 7: ermite.storage.CIStep
1475		-	(*CIJob)(nil), // 8: ermite.storage.CIJob
1476		-	(*CICheck)(nil), // 9: ermite.storage.CICheck
1477		-	(*CIRunner)(nil), // 10: ermite.storage.CIRunner
1478		-	nil, // 11: ermite.storage.CIJob.OutputsEntry
1479		-	(*timestamppb.Timestamp)(nil), // 12: google.protobuf.Timestamp
	1531	+	(CICancelReason)(0), // 5: ermite.storage.CICancelReason
	1532	+	(*CIRun)(nil), // 6: ermite.storage.CIRun
	1533	+	(*CIRunSource)(nil), // 7: ermite.storage.CIRunSource
	1534	+	(*CIStep)(nil), // 8: ermite.storage.CIStep
	1535	+	(*CIJob)(nil), // 9: ermite.storage.CIJob
	1536	+	(*CICheck)(nil), // 10: ermite.storage.CICheck
	1537	+	(*CIRunner)(nil), // 11: ermite.storage.CIRunner
	1538	+	nil, // 12: ermite.storage.CIJob.OutputsEntry
	1539	+	(*timestamppb.Timestamp)(nil), // 13: google.protobuf.Timestamp
1480	1540		}
1481	1541		var file_ermite_storage_ci_proto_depIdxs = []int32{
1482	1542		0, // 0: ermite.storage.CIRun.status:type_name -> ermite.storage.CIStatus
1483	1543		1, // 1: ermite.storage.CIRun.conclusion:type_name -> ermite.storage.CIConclusion
1484		-	12, // 2: ermite.storage.CIRun.created_at:type_name -> google.protobuf.Timestamp
1485		-	12, // 3: ermite.storage.CIRun.started_at:type_name -> google.protobuf.Timestamp
1486		-	12, // 4: ermite.storage.CIRun.completed_at:type_name -> google.protobuf.Timestamp
1487		-	12, // 5: ermite.storage.CIRun.cancel_requested_at:type_name -> google.protobuf.Timestamp
	1544	+	13, // 2: ermite.storage.CIRun.created_at:type_name -> google.protobuf.Timestamp
	1545	+	13, // 3: ermite.storage.CIRun.started_at:type_name -> google.protobuf.Timestamp
	1546	+	13, // 4: ermite.storage.CIRun.completed_at:type_name -> google.protobuf.Timestamp
	1547	+	13, // 5: ermite.storage.CIRun.cancel_requested_at:type_name -> google.protobuf.Timestamp
1488	1548		2, // 6: ermite.storage.CIStep.state:type_name -> ermite.storage.CIStepState
1489	1549		1, // 7: ermite.storage.CIStep.conclusion:type_name -> ermite.storage.CIConclusion
1490		-	12, // 8: ermite.storage.CIStep.started_at:type_name -> google.protobuf.Timestamp
1491		-	12, // 9: ermite.storage.CIStep.completed_at:type_name -> google.protobuf.Timestamp
	1550	+	13, // 8: ermite.storage.CIStep.started_at:type_name -> google.protobuf.Timestamp
	1551	+	13, // 9: ermite.storage.CIStep.completed_at:type_name -> google.protobuf.Timestamp
1492	1552		3, // 10: ermite.storage.CIJob.phase:type_name -> ermite.storage.CIJobPhase
1493	1553		1, // 11: ermite.storage.CIJob.conclusion:type_name -> ermite.storage.CIConclusion
1494	1554		4, // 12: ermite.storage.CIJob.isolation:type_name -> ermite.storage.CIIsolation
1495		-	7, // 13: ermite.storage.CIJob.steps:type_name -> ermite.storage.CIStep
1496		-	12, // 14: ermite.storage.CIJob.created_at:type_name -> google.protobuf.Timestamp
1497		-	12, // 15: ermite.storage.CIJob.started_at:type_name -> google.protobuf.Timestamp
1498		-	12, // 16: ermite.storage.CIJob.completed_at:type_name -> google.protobuf.Timestamp
1499		-	11, // 17: ermite.storage.CIJob.outputs:type_name -> ermite.storage.CIJob.OutputsEntry
1500		-	12, // 18: ermite.storage.CIJob.ready_at:type_name -> google.protobuf.Timestamp
1501		-	12, // 19: ermite.storage.CIJob.assigned_at:type_name -> google.protobuf.Timestamp
1502		-	12, // 20: ermite.storage.CIJob.acked_at:type_name -> google.protobuf.Timestamp
1503		-	12, // 21: ermite.storage.CIJob.token_valid_until:type_name -> google.protobuf.Timestamp
1504		-	12, // 22: ermite.storage.CIJob.cancel_requested_at:type_name -> google.protobuf.Timestamp
1505		-	0, // 23: ermite.storage.CICheck.status:type_name -> ermite.storage.CIStatus
1506		-	1, // 24: ermite.storage.CICheck.conclusion:type_name -> ermite.storage.CIConclusion
1507		-	12, // 25: ermite.storage.CICheck.created_at:type_name -> google.protobuf.Timestamp
1508		-	12, // 26: ermite.storage.CICheck.started_at:type_name -> google.protobuf.Timestamp
1509		-	12, // 27: ermite.storage.CICheck.completed_at:type_name -> google.protobuf.Timestamp
1510		-	4, // 28: ermite.storage.CIRunner.isolation:type_name -> ermite.storage.CIIsolation
1511		-	12, // 29: ermite.storage.CIRunner.registered_at:type_name -> google.protobuf.Timestamp
1512		-	30, // [30:30] is the sub-list for method output_type
1513		-	30, // [30:30] is the sub-list for method input_type
1514		-	30, // [30:30] is the sub-list for extension type_name
1515		-	30, // [30:30] is the sub-list for extension extendee
1516		-	0, // [0:30] is the sub-list for field type_name
	1555	+	8, // 13: ermite.storage.CIJob.steps:type_name -> ermite.storage.CIStep
	1556	+	13, // 14: ermite.storage.CIJob.created_at:type_name -> google.protobuf.Timestamp
	1557	+	13, // 15: ermite.storage.CIJob.started_at:type_name -> google.protobuf.Timestamp
	1558	+	13, // 16: ermite.storage.CIJob.completed_at:type_name -> google.protobuf.Timestamp
	1559	+	12, // 17: ermite.storage.CIJob.outputs:type_name -> ermite.storage.CIJob.OutputsEntry
	1560	+	13, // 18: ermite.storage.CIJob.ready_at:type_name -> google.protobuf.Timestamp
	1561	+	13, // 19: ermite.storage.CIJob.assigned_at:type_name -> google.protobuf.Timestamp
	1562	+	13, // 20: ermite.storage.CIJob.acked_at:type_name -> google.protobuf.Timestamp
	1563	+	13, // 21: ermite.storage.CIJob.token_valid_until:type_name -> google.protobuf.Timestamp
	1564	+	5, // 22: ermite.storage.CIJob.cancel_reason:type_name -> ermite.storage.CICancelReason
	1565	+	13, // 23: ermite.storage.CIJob.cancel_requested_at:type_name -> google.protobuf.Timestamp
	1566	+	0, // 24: ermite.storage.CICheck.status:type_name -> ermite.storage.CIStatus
	1567	+	1, // 25: ermite.storage.CICheck.conclusion:type_name -> ermite.storage.CIConclusion
	1568	+	13, // 26: ermite.storage.CICheck.created_at:type_name -> google.protobuf.Timestamp
	1569	+	13, // 27: ermite.storage.CICheck.started_at:type_name -> google.protobuf.Timestamp
	1570	+	13, // 28: ermite.storage.CICheck.completed_at:type_name -> google.protobuf.Timestamp
	1571	+	4, // 29: ermite.storage.CIRunner.isolation:type_name -> ermite.storage.CIIsolation
	1572	+	13, // 30: ermite.storage.CIRunner.registered_at:type_name -> google.protobuf.Timestamp
	1573	+	31, // [31:31] is the sub-list for method output_type
	1574	+	31, // [31:31] is the sub-list for method input_type
	1575	+	31, // [31:31] is the sub-list for extension type_name
	1576	+	31, // [31:31] is the sub-list for extension extendee
	1577	+	0, // [0:31] is the sub-list for field type_name
1517	1578		}
1518	1579
1519	1580		func init() { file_ermite_storage_ci_proto_init() }

@@ -1526,7 +1587,7 @@ func file_ermite_storage_ci_proto_init() {
1526	1587		File: protoimpl.DescBuilder{
1527	1588		GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
1528	1589		RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_storage_ci_proto_rawDesc), len(file_ermite_storage_ci_proto_rawDesc)),
1529		-	NumEnums: 5,
	1590	+	NumEnums: 6,
1530	1591		NumMessages: 7,
1531	1592		NumExtensions: 0,
1532	1593		NumServices: 0,

 	return file_ermite_storage_ci_proto_rawDescGZIP(), []int{4}
 }
+// CICancelReason says why a job is asked to stop.
+type CICancelReason int32
+const (
+	CICancelReason_CI_CANCEL_REASON_UNSPECIFIED CICancelReason = 0
+	CICancelReason_CI_CANCEL_REASON_USER        CICancelReason = 1
+	CICancelReason_CI_CANCEL_REASON_FAIL_FAST   CICancelReason = 2
+	CICancelReason_CI_CANCEL_REASON_TIMEOUT     CICancelReason = 3
+)
+// Enum value maps for CICancelReason.
+var (
+	CICancelReason_name = map[int32]string{
+		0: "CI_CANCEL_REASON_UNSPECIFIED",
+		1: "CI_CANCEL_REASON_USER",
+		2: "CI_CANCEL_REASON_FAIL_FAST",
+		3: "CI_CANCEL_REASON_TIMEOUT",
+	}
+	CICancelReason_value = map[string]int32{
+		"CI_CANCEL_REASON_UNSPECIFIED": 0,
+		"CI_CANCEL_REASON_USER":        1,
+		"CI_CANCEL_REASON_FAIL_FAST":   2,
+		"CI_CANCEL_REASON_TIMEOUT":     3,
+	}
+)
+func (x CICancelReason) Enum() *CICancelReason {
+	p := new(CICancelReason)
+	*p = x
+	return p
+}
+func (x CICancelReason) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+func (CICancelReason) Descriptor() protoreflect.EnumDescriptor {
+	return file_ermite_storage_ci_proto_enumTypes[5].Descriptor()
+}
+func (CICancelReason) Type() protoreflect.EnumType {
+	return &file_ermite_storage_ci_proto_enumTypes[5]
+}
+func (x CICancelReason) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+// Deprecated: Use CICancelReason.Descriptor instead.
+func (CICancelReason) EnumDescriptor() ([]byte, []int) {
+	return file_ermite_storage_ci_proto_rawDescGZIP(), []int{5}
+}
 // CIRun is stored under "run/<repo>/<id:020d>".
 type CIRun struct {
 	state             protoimpl.MessageState `protogen:"open.v1"`
 	AckedAt           *timestamppb.Timestamp `protobuf:"bytes,30,opt,name=acked_at,json=ackedAt,proto3" json:"acked_at,omitempty"`
 	AssignCancels     int32                  `protobuf:"varint,31,opt,name=assign_cancels,json=assignCancels,proto3" json:"assign_cancels,omitempty"`
 	TokenValidUntil   *timestamppb.Timestamp `protobuf:"bytes,32,opt,name=token_valid_until,json=tokenValidUntil,proto3" json:"token_valid_until,omitempty"`
-	CancelReason      int32                  `protobuf:"varint,33,opt,name=cancel_reason,json=cancelReason,proto3" json:"cancel_reason,omitempty"`
+	CancelReason      CICancelReason         `protobuf:"varint,33,opt,name=cancel_reason,json=cancelReason,proto3,enum=ermite.storage.CICancelReason" json:"cancel_reason,omitempty"`
 	CancelMessage     string                 `protobuf:"bytes,34,opt,name=cancel_message,json=cancelMessage,proto3" json:"cancel_message,omitempty"`
 	CancelRequestedAt *timestamppb.Timestamp `protobuf:"bytes,35,opt,name=cancel_requested_at,json=cancelRequestedAt,proto3" json:"cancel_requested_at,omitempty"`
 	// Set when the job is planned: runs-on, name and contexts are evaluated.
 	return nil
 }
-func (x *CIJob) GetCancelReason() int32 {
+func (x *CIJob) GetCancelReason() CICancelReason {
 	if x != nil {
 		return x.CancelReason
 	}
-	return 0
+	return CICancelReason_CI_CANCEL_REASON_UNSPECIFIED
 }
 func (x *CIJob) GetCancelMessage() string {
 const file_ermite_storage_ci_proto_rawDesc = "" +
 	"\n" +
-	"\x17ermite/storage/ci.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\xbf\x05\n" +
+	"\x17ermite/storage/ci.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\xcb\x05\n" +
 	"\x05CIRun\x12\x12\n" +
 	"\x04repo\x18\x01 \x01(\tR\x04repo\x12\x0e\n" +
 	"\x02id\x18\x02 \x01(\x03R\x02id\x12\x16\n" +
 	"started_at\x18\x10 \x01(\v2\x1a.google.protobuf.TimestampR\tstartedAt\x12=\n" +
 	"\fcompleted_at\x18\x11 \x01(\v2\x1a.google.protobuf.TimestampR\vcompletedAt\x12)\n" +
 	"\x10cancel_requested\x18\x14 \x01(\bR\x0fcancelRequested\x12J\n" +
-	"\x13cancel_requested_at\x18\x15 \x01(\v2\x1a.google.protobuf.TimestampR\x11cancelRequestedAt\"~\n" +
+	"\x13cancel_requested_at\x18\x15 \x01(\v2\x1a.google.protobuf.TimestampR\x11cancelRequestedAtJ\x04\b\x12\x10\x13J\x04\b\x13\x10\x14\"~\n" +
 	"\vCIRunSource\x12\x15\n" +
 	"\x06run_id\x18\x04 \x01(\x03R\x05runId\x12#\n" +
 	"\rworkflow_yaml\x18\x01 \x01(\tR\fworkflowYaml\x12\x1f\n" +
 	"\vgithub_json\x18\x02 \x01(\tR\n" +
 	"githubJson\x12\x12\n" +
-	"\x04repo\x18\x03 \x01(\tR\x04repo\"\xd9\x02\n" +
+	"\x04repo\x18\x03 \x01(\tR\x04repo\"\xe5\x02\n" +
 	"\x06CIStep\x12\x16\n" +
 	"\x06number\x18\x01 \x01(\x05R\x06number\x12\x12\n" +
 	"\x04name\x18\x02 \x01(\tR\x04name\x121\n" +
 	"started_at\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\tstartedAt\x12=\n" +
 	"\fcompleted_at\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\vcompletedAt\x12\x1b\n" +
 	"\tlog_start\x18\a \x01(\x03R\blogStart\x12\x1b\n" +
-	"\thas_lines\x18\t \x01(\bR\bhasLines\"\x94\f\n" +
+	"\thas_lines\x18\t \x01(\bR\bhasLinesJ\x04\b\b\x10\tJ\x04\b\n" +
+	"\x10\v\"\xba\f\n" +
 	"\x05CIJob\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x15\n" +
 	"\x06run_id\x18\x02 \x01(\x03R\x05runId\x12\x18\n" +
 	"assignedAt\x125\n" +
 	"\backed_at\x18\x1e \x01(\v2\x1a.google.protobuf.TimestampR\aackedAt\x12%\n" +
 	"\x0eassign_cancels\x18\x1f \x01(\x05R\rassignCancels\x12F\n" +
-	"\x11token_valid_until\x18  \x01(\v2\x1a.google.protobuf.TimestampR\x0ftokenValidUntil\x12#\n" +
+	"\x11token_valid_until\x18  \x01(\v2\x1a.google.protobuf.TimestampR\x0ftokenValidUntil\x12C\n" +
-	"\rcancel_reason\x18! \x01(\x05R\fcancelReason\x12%\n" +
+	"\rcancel_reason\x18! \x01(\x0e2\x1e.ermite.storage.CICancelReasonR\fcancelReason\x12%\n" +
 	"\x0ecancel_message\x18\" \x01(\tR\rcancelMessage\x12J\n" +
 	"\x13cancel_requested_at\x18# \x01(\v2\x1a.google.protobuf.TimestampR\x11cancelRequestedAt\x12\x18\n" +
 	"\aplanned\x18% \x01(\bR\aplanned\x12\x1f\n" +
 	"\rcontexts_json\x18' \x01(\tR\fcontextsJson\x1a:\n" +
 	"\fOutputsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
-	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xe5\x03\n" +
+	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01J\x04\b$\x10%\"\xe5\x03\n" +
 	"\aCICheck\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
 	"\x04repo\x18\x02 \x01(\tR\x04repo\x12\x10\n" +
 	"\x18CI_ISOLATION_UNSPECIFIED\x10\x00\x12\x13\n" +
 	"\x0fCI_ISOLATION_VM\x10\x01\x12!\n" +
 	"\x1dCI_ISOLATION_CONTAINER_SYSBOX\x10\x02\x12%\n" +
-	"!CI_ISOLATION_CONTAINER_PRIVILEGED\x10\x03B/Z-bnema.dev/ermite/gen/ermite/storage;storagepbb\x06proto3"
+	"!CI_ISOLATION_CONTAINER_PRIVILEGED\x10\x03*\x8b\x01\n" +
+	"\x0eCICancelReason\x12 \n" +
+	"\x1cCI_CANCEL_REASON_UNSPECIFIED\x10\x00\x12\x19\n" +
+	"\x15CI_CANCEL_REASON_USER\x10\x01\x12\x1e\n" +
+	"\x1aCI_CANCEL_REASON_FAIL_FAST\x10\x02\x12\x1c\n" +
+	"\x18CI_CANCEL_REASON_TIMEOUT\x10\x03B/Z-bnema.dev/ermite/gen/ermite/storage;storagepbb\x06proto3"
 var (
 	file_ermite_storage_ci_proto_rawDescOnce sync.Once
 	return file_ermite_storage_ci_proto_rawDescData
 }
-var file_ermite_storage_ci_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
+var file_ermite_storage_ci_proto_enumTypes = make([]protoimpl.EnumInfo, 6)
 var file_ermite_storage_ci_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_ermite_storage_ci_proto_goTypes = []any{
 	(CIStatus)(0),                 // 0: ermite.storage.CIStatus
 	(CIStepState)(0),              // 2: ermite.storage.CIStepState
 	(CIJobPhase)(0),               // 3: ermite.storage.CIJobPhase
 	(CIIsolation)(0),              // 4: ermite.storage.CIIsolation
-	(*CIRun)(nil),                 // 5: ermite.storage.CIRun
+	(CICancelReason)(0),           // 5: ermite.storage.CICancelReason
-	(*CIRunSource)(nil),           // 6: ermite.storage.CIRunSource
+	(*CIRun)(nil),                 // 6: ermite.storage.CIRun
-	(*CIStep)(nil),                // 7: ermite.storage.CIStep
+	(*CIRunSource)(nil),           // 7: ermite.storage.CIRunSource
-	(*CIJob)(nil),                 // 8: ermite.storage.CIJob
+	(*CIStep)(nil),                // 8: ermite.storage.CIStep
-	(*CICheck)(nil),               // 9: ermite.storage.CICheck
+	(*CIJob)(nil),                 // 9: ermite.storage.CIJob
-	(*CIRunner)(nil),              // 10: ermite.storage.CIRunner
+	(*CICheck)(nil),               // 10: ermite.storage.CICheck
-	nil,                           // 11: ermite.storage.CIJob.OutputsEntry
+	(*CIRunner)(nil),              // 11: ermite.storage.CIRunner
-	(*timestamppb.Timestamp)(nil), // 12: google.protobuf.Timestamp
+	nil,                           // 12: ermite.storage.CIJob.OutputsEntry
+	(*timestamppb.Timestamp)(nil), // 13: google.protobuf.Timestamp
 }
 var file_ermite_storage_ci_proto_depIdxs = []int32{
 	0,  // 0: ermite.storage.CIRun.status:type_name -> ermite.storage.CIStatus
 	1,  // 1: ermite.storage.CIRun.conclusion:type_name -> ermite.storage.CIConclusion
-	12, // 2: ermite.storage.CIRun.created_at:type_name -> google.protobuf.Timestamp
+	13, // 2: ermite.storage.CIRun.created_at:type_name -> google.protobuf.Timestamp
-	12, // 3: ermite.storage.CIRun.started_at:type_name -> google.protobuf.Timestamp
+	13, // 3: ermite.storage.CIRun.started_at:type_name -> google.protobuf.Timestamp
-	12, // 4: ermite.storage.CIRun.completed_at:type_name -> google.protobuf.Timestamp
+	13, // 4: ermite.storage.CIRun.completed_at:type_name -> google.protobuf.Timestamp
-	12, // 5: ermite.storage.CIRun.cancel_requested_at:type_name -> google.protobuf.Timestamp
+	13, // 5: ermite.storage.CIRun.cancel_requested_at:type_name -> google.protobuf.Timestamp
 	2,  // 6: ermite.storage.CIStep.state:type_name -> ermite.storage.CIStepState
 	1,  // 7: ermite.storage.CIStep.conclusion:type_name -> ermite.storage.CIConclusion
-	12, // 8: ermite.storage.CIStep.started_at:type_name -> google.protobuf.Timestamp
+	13, // 8: ermite.storage.CIStep.started_at:type_name -> google.protobuf.Timestamp
-	12, // 9: ermite.storage.CIStep.completed_at:type_name -> google.protobuf.Timestamp
+	13, // 9: ermite.storage.CIStep.completed_at:type_name -> google.protobuf.Timestamp
 	3,  // 10: ermite.storage.CIJob.phase:type_name -> ermite.storage.CIJobPhase
 	1,  // 11: ermite.storage.CIJob.conclusion:type_name -> ermite.storage.CIConclusion
 	4,  // 12: ermite.storage.CIJob.isolation:type_name -> ermite.storage.CIIsolation
-	7,  // 13: ermite.storage.CIJob.steps:type_name -> ermite.storage.CIStep
+	8,  // 13: ermite.storage.CIJob.steps:type_name -> ermite.storage.CIStep
-	12, // 14: ermite.storage.CIJob.created_at:type_name -> google.protobuf.Timestamp
+	13, // 14: ermite.storage.CIJob.created_at:type_name -> google.protobuf.Timestamp
-	12, // 15: ermite.storage.CIJob.started_at:type_name -> google.protobuf.Timestamp
+	13, // 15: ermite.storage.CIJob.started_at:type_name -> google.protobuf.Timestamp
-	12, // 16: ermite.storage.CIJob.completed_at:type_name -> google.protobuf.Timestamp
+	13, // 16: ermite.storage.CIJob.completed_at:type_name -> google.protobuf.Timestamp
-	11, // 17: ermite.storage.CIJob.outputs:type_name -> ermite.storage.CIJob.OutputsEntry
+	12, // 17: ermite.storage.CIJob.outputs:type_name -> ermite.storage.CIJob.OutputsEntry
-	12, // 18: ermite.storage.CIJob.ready_at:type_name -> google.protobuf.Timestamp
+	13, // 18: ermite.storage.CIJob.ready_at:type_name -> google.protobuf.Timestamp
-	12, // 19: ermite.storage.CIJob.assigned_at:type_name -> google.protobuf.Timestamp
+	13, // 19: ermite.storage.CIJob.assigned_at:type_name -> google.protobuf.Timestamp
-	12, // 20: ermite.storage.CIJob.acked_at:type_name -> google.protobuf.Timestamp
+	13, // 20: ermite.storage.CIJob.acked_at:type_name -> google.protobuf.Timestamp
-	12, // 21: ermite.storage.CIJob.token_valid_until:type_name -> google.protobuf.Timestamp
+	13, // 21: ermite.storage.CIJob.token_valid_until:type_name -> google.protobuf.Timestamp
-	12, // 22: ermite.storage.CIJob.cancel_requested_at:type_name -> google.protobuf.Timestamp
+	5,  // 22: ermite.storage.CIJob.cancel_reason:type_name -> ermite.storage.CICancelReason
-	0,  // 23: ermite.storage.CICheck.status:type_name -> ermite.storage.CIStatus
+	13, // 23: ermite.storage.CIJob.cancel_requested_at:type_name -> google.protobuf.Timestamp
-	1,  // 24: ermite.storage.CICheck.conclusion:type_name -> ermite.storage.CIConclusion
+	0,  // 24: ermite.storage.CICheck.status:type_name -> ermite.storage.CIStatus
-	12, // 25: ermite.storage.CICheck.created_at:type_name -> google.protobuf.Timestamp
+	1,  // 25: ermite.storage.CICheck.conclusion:type_name -> ermite.storage.CIConclusion
-	12, // 26: ermite.storage.CICheck.started_at:type_name -> google.protobuf.Timestamp
+	13, // 26: ermite.storage.CICheck.created_at:type_name -> google.protobuf.Timestamp
-	12, // 27: ermite.storage.CICheck.completed_at:type_name -> google.protobuf.Timestamp
+	13, // 27: ermite.storage.CICheck.started_at:type_name -> google.protobuf.Timestamp
-	4,  // 28: ermite.storage.CIRunner.isolation:type_name -> ermite.storage.CIIsolation
+	13, // 28: ermite.storage.CICheck.completed_at:type_name -> google.protobuf.Timestamp
-	12, // 29: ermite.storage.CIRunner.registered_at:type_name -> google.protobuf.Timestamp
+	4,  // 29: ermite.storage.CIRunner.isolation:type_name -> ermite.storage.CIIsolation
-	30, // [30:30] is the sub-list for method output_type
+	13, // 30: ermite.storage.CIRunner.registered_at:type_name -> google.protobuf.Timestamp
-	30, // [30:30] is the sub-list for method input_type
+	31, // [31:31] is the sub-list for method output_type
-	30, // [30:30] is the sub-list for extension type_name
+	31, // [31:31] is the sub-list for method input_type
-	30, // [30:30] is the sub-list for extension extendee
+	31, // [31:31] is the sub-list for extension type_name
-	0,  // [0:30] is the sub-list for field type_name
+	31, // [31:31] is the sub-list for extension extendee
+	0,  // [0:31] is the sub-list for field type_name
 }
 func init() { file_ermite_storage_ci_proto_init() }
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_storage_ci_proto_rawDesc), len(file_ermite_storage_ci_proto_rawDesc)),
-			NumEnums:      5,
+			NumEnums:      6,
 			NumMessages:   7,
 			NumExtensions: 0,
 			NumServices:   0,

M internal/adapters/kvstore/ci.go +28 -6


@@ -235,7 +235,32 @@ func decodeStepState(s storagepb.CIStepState) domain.CIStepState {
235	235		return domain.CIStepPending
236	236		}
237	237
238		-	var cancelReasons = []domain.CICancelReason{domain.CICancelNone, domain.CICancelUser, domain.CICancelFailFast, domain.CICancelTimeout}
	238	+	var cancelReasons = []struct {
	239	+	d domain.CICancelReason
	240	+	p storagepb.CICancelReason
	241	+	}{
	242	+	{domain.CICancelUser, storagepb.CICancelReason_CI_CANCEL_REASON_USER},
	243	+	{domain.CICancelFailFast, storagepb.CICancelReason_CI_CANCEL_REASON_FAIL_FAST},
	244	+	{domain.CICancelTimeout, storagepb.CICancelReason_CI_CANCEL_REASON_TIMEOUT},
	245	+	}
	246	+
	247	+	func encodeCancelReason(r domain.CICancelReason) storagepb.CICancelReason {
	248	+	for _, e := range cancelReasons {
	249	+	if e.d == r {
	250	+	return e.p
	251	+	}
	252	+	}
	253	+	return storagepb.CICancelReason_CI_CANCEL_REASON_UNSPECIFIED
	254	+	}
	255	+
	256	+	func decodeCancelReason(r storagepb.CICancelReason) domain.CICancelReason {
	257	+	for _, e := range cancelReasons {
	258	+	if e.p == r {
	259	+	return e.d
	260	+	}
	261	+	}
	262	+	return domain.CICancelNone
	263	+	}
239	264
240	265		func encodeRun(r domain.CIRun) ([]byte, error) {
241	266		if r.Repo.IsZero() {

@@ -287,7 +312,6 @@ func encodeJob(j domain.CIJob) ([]byte, error) {
287	312		LogStart: s.LogStart, HasLines: s.HasLines,
288	313		})
289	314		}
290		-	reason := int32(slices.Index(cancelReasons, j.CancelReason))
291	315		pb := &storagepb.CIJob{
292	316		Id: j.ID, RunId: j.RunID, Attempt: j.Attempt, RunAttempt: j.RunAttempt, Repo: j.Repo.String(),
293	317		Key: j.Key, Name: j.Name, Phase: phase, Conclusion: encodeConclusion(j.Conclusion), Error: j.Error,

@@ -298,7 +322,7 @@ func encodeJob(j domain.CIJob) ([]byte, error) {
298	322		TimeoutMinutes: j.TimeoutMinutes, FailFast: j.FailFast, MaxParallel: int32(j.MaxParallel), //nolint:gosec // validated at planning
299	323		Outputs: j.Outputs, ReadyAt: encodeTime(j.ReadyAt), AssignedAt: encodeTime(j.AssignedAt),
300	324		AckedAt: encodeTime(j.AckedAt), AssignCancels: int32(j.AssignCancels), //nolint:gosec // at most 3
301		-	TokenValidUntil: encodeTime(j.TokenValidUntil), CancelReason: max(reason, 0), CancelMessage: j.CancelMessage,
	325	+	TokenValidUntil: encodeTime(j.TokenValidUntil), CancelReason: encodeCancelReason(j.CancelReason), CancelMessage: j.CancelMessage,
302	326		CancelRequestedAt: encodeTime(j.CancelRequestedAt), Planned: j.Planned,
303	327		}
304	328		if j.HasToken() {

@@ -331,9 +355,7 @@ func decodeJob(item kv.Item) (domain.CIJob, error) {
331	355		CancelMessage: pb.GetCancelMessage(), CancelRequestedAt: decodeTime(pb.GetCancelRequestedAt()),
332	356		Version: item.Version,
333	357		}
334		-	if r := int(pb.GetCancelReason()); r >= 0 && r < len(cancelReasons) {
335		-	j.CancelReason = cancelReasons[r]
336		-	}
	358	+	j.CancelReason = decodeCancelReason(pb.GetCancelReason())
337	359		copy(j.TokenHash[:], pb.GetTokenHash())
338	360		for _, s := range pb.GetSteps() {
339	361		j.Steps = append(j.Steps, domain.CIStep{

 	return domain.CIStepPending
 }
-var cancelReasons = []domain.CICancelReason{domain.CICancelNone, domain.CICancelUser, domain.CICancelFailFast, domain.CICancelTimeout}
+var cancelReasons = []struct {
+	d domain.CICancelReason
+	p storagepb.CICancelReason
+}{
+	{domain.CICancelUser, storagepb.CICancelReason_CI_CANCEL_REASON_USER},
+	{domain.CICancelFailFast, storagepb.CICancelReason_CI_CANCEL_REASON_FAIL_FAST},
+	{domain.CICancelTimeout, storagepb.CICancelReason_CI_CANCEL_REASON_TIMEOUT},
+}
+func encodeCancelReason(r domain.CICancelReason) storagepb.CICancelReason {
+	for _, e := range cancelReasons {
+		if e.d == r {
+			return e.p
+		}
+	}
+	return storagepb.CICancelReason_CI_CANCEL_REASON_UNSPECIFIED
+}
+func decodeCancelReason(r storagepb.CICancelReason) domain.CICancelReason {
+	for _, e := range cancelReasons {
+		if e.p == r {
+			return e.d
+		}
+	}
+	return domain.CICancelNone
+}
 func encodeRun(r domain.CIRun) ([]byte, error) {
 	if r.Repo.IsZero() {
 			LogStart: s.LogStart, HasLines: s.HasLines,
 		})
 	}
-	reason := int32(slices.Index(cancelReasons, j.CancelReason))
 	pb := &storagepb.CIJob{
 		Id: j.ID, RunId: j.RunID, Attempt: j.Attempt, RunAttempt: j.RunAttempt, Repo: j.Repo.String(),
 		Key: j.Key, Name: j.Name, Phase: phase, Conclusion: encodeConclusion(j.Conclusion), Error: j.Error,
 		TimeoutMinutes: j.TimeoutMinutes, FailFast: j.FailFast, MaxParallel: int32(j.MaxParallel), //nolint:gosec // validated at planning
 		Outputs: j.Outputs, ReadyAt: encodeTime(j.ReadyAt), AssignedAt: encodeTime(j.AssignedAt),
 		AckedAt: encodeTime(j.AckedAt), AssignCancels: int32(j.AssignCancels), //nolint:gosec // at most 3
-		TokenValidUntil: encodeTime(j.TokenValidUntil), CancelReason: max(reason, 0), CancelMessage: j.CancelMessage,
+		TokenValidUntil: encodeTime(j.TokenValidUntil), CancelReason: encodeCancelReason(j.CancelReason), CancelMessage: j.CancelMessage,
 		CancelRequestedAt: encodeTime(j.CancelRequestedAt), Planned: j.Planned,
 	}
 	if j.HasToken() {
 		CancelMessage: pb.GetCancelMessage(), CancelRequestedAt: decodeTime(pb.GetCancelRequestedAt()),
 		Version: item.Version,
 	}
-	if r := int(pb.GetCancelReason()); r >= 0 && r < len(cancelReasons) {
+	j.CancelReason = decodeCancelReason(pb.GetCancelReason())
-		j.CancelReason = cancelReasons[r]
-	}
 	copy(j.TokenHash[:], pb.GetTokenHash())
 	for _, s := range pb.GetSteps() {
 		j.Steps = append(j.Steps, domain.CIStep{

M internal/adapters/kvstore/ci_test.go +17 -0


@@ -356,3 +356,20 @@ func TestCIStateSurvivesARestart(t *testing.T) {
356	356		active, _ := ci2.ListActiveJobs(ctx)
357	357		assert.Len(t, active, 1)
358	358		}
	359	+
	360	+	func TestCICancelReasonsRoundTrip(t *testing.T) {
	361	+	ctx := context.Background()
	362	+	_, ci, n := ciRepo(t)
	363	+	d, err := ci.CreateRun(ctx, n, "w.yml", draftOf(n, "w.yml", 1))
	364	+	require.NoError(t, err)
	365	+	for _, reason := range []domain.CICancelReason{domain.CICancelUser, domain.CICancelFailFast, domain.CICancelTimeout, domain.CICancelNone} {
	366	+	j, err := ci.GetJob(ctx, d.Run.ID, 1, d.Jobs[0].ID)
	367	+	require.NoError(t, err)
	368	+	j.CancelReason, j.CancelMessage, j.CancelRequestedAt = reason, "why", created
	369	+	_, err = ci.Apply(ctx, ports.CIWrite{Jobs: []domain.CIJob{j}})
	370	+	require.NoError(t, err)
	371	+	got, err := ci.GetJob(ctx, d.Run.ID, 1, d.Jobs[0].ID)
	372	+	require.NoError(t, err)
	373	+	assert.Equal(t, reason, got.CancelReason)
	374	+	}
	375	+	}


@@ -356,3 +356,20 @@ func TestCIStateSurvivesARestart(t *testing.T) {
356	active, _ := ci2.ListActiveJobs(ctx)	356		active, _ := ci2.ListActiveJobs(ctx)
357	assert.Len(t, active, 1)	357		assert.Len(t, active, 1)
358	}	358		}
		359	+
		360	+	func TestCICancelReasonsRoundTrip(t *testing.T) {
		361	+	ctx := context.Background()
		362	+	_, ci, n := ciRepo(t)
		363	+	d, err := ci.CreateRun(ctx, n, "w.yml", draftOf(n, "w.yml", 1))
		364	+	require.NoError(t, err)
		365	+	for _, reason := range []domain.CICancelReason{domain.CICancelUser, domain.CICancelFailFast, domain.CICancelTimeout, domain.CICancelNone} {
		366	+	j, err := ci.GetJob(ctx, d.Run.ID, 1, d.Jobs[0].ID)
		367	+	require.NoError(t, err)
		368	+	j.CancelReason, j.CancelMessage, j.CancelRequestedAt = reason, "why", created
		369	+	_, err = ci.Apply(ctx, ports.CIWrite{Jobs: []domain.CIJob{j}})
		370	+	require.NoError(t, err)
		371	+	got, err := ci.GetJob(ctx, d.Run.ID, 1, d.Jobs[0].ID)
		372	+	require.NoError(t, err)
		373	+	assert.Equal(t, reason, got.CancelReason)
		374	+	}
		375	+	}

M internal/adapters/web/events.go +2 -2


@@ -56,8 +56,8 @@ import (
56	56		// ci-run data: <tr id="run-<id>">…</tr> (the list of runs) or
57	57		// <div id="run-body">…</div> (one run)
58	58		// ci-job data: <h2 id="job-head">…</h2> and <ol id="job-steps">…</ol>; the log
59		-	// itself is never sent in the stream, the page reads the lines after
60		-	// the last it holds from /raw?from=
	59	+	// itself is never sent in this stream: the page follows it on its own
	60	+	// feed, /<repo>/actions/runs/<id>/job/<job>/stream?from=<line>
61	61		// gap data: gap; events were lost, or what the page shows is gone or
62	62		// changed: the page fetches itself again (ermiteLive in ermite.js)
63	63		//


@@ -56,8 +56,8 @@ import (
56		// ci-run data: <tr id="run-<id>">…</tr> (the list of runs) or	56		// ci-run data: <tr id="run-<id>">…</tr> (the list of runs) or
57		// <div id="run-body">…</div> (one run)	57		// <div id="run-body">…</div> (one run)
58		// ci-job data: <h2 id="job-head">…</h2> and <ol id="job-steps">…</ol>; the log	58		// ci-job data: <h2 id="job-head">…</h2> and <ol id="job-steps">…</ol>; the log
59	-	// itself is never sent in the stream, the page reads the lines after	59	+	// itself is never sent in this stream: the page follows it on its own
60	-	// the last it holds from /raw?from=	60	+	// feed, /<repo>/actions/runs/<id>/job/<job>/stream?from=<line>
61		// gap data: gap; events were lost, or what the page shows is gone or	61		// gap data: gap; events were lost, or what the page shows is gone or
62		// changed: the page fetches itself again (ermiteLive in ermite.js)	62		// changed: the page fetches itself again (ermiteLive in ermite.js)
63		//	63		//

M proto/ermite/storage/ci.proto +17 -1


@@ -63,8 +63,19 @@ enum CIIsolation {
63	63		CI_ISOLATION_CONTAINER_PRIVILEGED = 3;
64	64		}
65	65
	66	+	// CICancelReason says why a job is asked to stop.
	67	+	enum CICancelReason {
	68	+	CI_CANCEL_REASON_UNSPECIFIED = 0;
	69	+	CI_CANCEL_REASON_USER = 1;
	70	+	CI_CANCEL_REASON_FAIL_FAST = 2;
	71	+	CI_CANCEL_REASON_TIMEOUT = 3;
	72	+	}
	73	+
66	74		// CIRun is stored under "run/<repo>/<id:020d>".
67	75		message CIRun {
	76	+	// 18 and 19 were the workflow file and the github context, which moved to
	77	+	// CIRunSource.
	78	+	reserved 18, 19;
68	79		string repo = 1;
69	80		int64 id = 2;
70	81		int64 number = 3;

@@ -101,6 +112,9 @@ message CIRunSource {
101	112
102	113		// CIStep is a step of a job.
103	114		message CIStep {
	115	+	// 8 and 10 were the end of the step, which is derived from the next step's
	116	+	// start and the line count.
	117	+	reserved 8, 10;
104	118		int32 number = 1;
105	119		string name = 2;
106	120		CIStepState state = 3;

@@ -116,6 +130,8 @@ message CIStep {
116	130
117	131		// CIJob is stored under "job/<run_id:020d>/<run_attempt:010d>/<job id>".
118	132		message CIJob {
	133	+	// 36 was the line count of the log, which the log file holds.
	134	+	reserved 36;
119	135		string id = 1;
120	136		int64 run_id = 2;
121	137		// Attempt in which the job executed (the one of its log).

@@ -152,7 +168,7 @@ message CIJob {
152	168		google.protobuf.Timestamp acked_at = 30;
153	169		int32 assign_cancels = 31;
154	170		google.protobuf.Timestamp token_valid_until = 32;
155		-	int32 cancel_reason = 33;
	171	+	CICancelReason cancel_reason = 33;
156	172		string cancel_message = 34;
157	173		google.protobuf.Timestamp cancel_requested_at = 35;
158	174		// Set when the job is planned: runs-on, name and contexts are evaluated.

   CI_ISOLATION_CONTAINER_PRIVILEGED = 3;
 }
+// CICancelReason says why a job is asked to stop.
+enum CICancelReason {
+  CI_CANCEL_REASON_UNSPECIFIED = 0;
+  CI_CANCEL_REASON_USER = 1;
+  CI_CANCEL_REASON_FAIL_FAST = 2;
+  CI_CANCEL_REASON_TIMEOUT = 3;
+}
 // CIRun is stored under "run/<repo>/<id:020d>".
 message CIRun {
+  // 18 and 19 were the workflow file and the github context, which moved to
+  // CIRunSource.
+  reserved 18, 19;
   string repo = 1;
   int64 id = 2;
   int64 number = 3;
 // CIStep is a step of a job.
 message CIStep {
+  // 8 and 10 were the end of the step, which is derived from the next step's
+  // start and the line count.
+  reserved 8, 10;
   int32 number = 1;
   string name = 2;
   CIStepState state = 3;
 // CIJob is stored under "job/<run_id:020d>/<run_attempt:010d>/<job id>".
 message CIJob {
+  // 36 was the line count of the log, which the log file holds.
+  reserved 36;
   string id = 1;
   int64 run_id = 2;
   // Attempt in which the job executed (the one of its log).
   google.protobuf.Timestamp acked_at = 30;
   int32 assign_cancels = 31;
   google.protobuf.Timestamp token_valid_until = 32;
-  int32 cancel_reason = 33;
+  CICancelReason cancel_reason = 33;
   string cancel_message = 34;
   google.protobuf.Timestamp cancel_requested_at = 35;
   // Set when the job is planned: runs-on, name and contexts are evaluated.