Clean up

lib/events.ts

@@ -24,6 +24,7 @@ import {
 	repository,
 	retry,
 	runSteps,
+	secret,
 	status,
 	Step,
 	tmpFs,
@@ -67,7 +68,9 @@ const LoadProjectStep: NpmStep = {
 			repository.gitHub({
 				owner: repo.owner,
 				repo: repo.name,
-				credential: { token: repo.installationToken, scopes: [] },
+				credential: await ctx.credential.resolve(
+					secret.gitHubAppTokenFromRepository(ctx.data.commit),
+				),
 			}),
 		);
 		params.project = project;
@@ -418,7 +421,9 @@ const NpmVersionStep: NpmStep = {
 			}
 		} else {
 			const octokit = github.api({
-				credential: { token: repo.installationToken, scopes: [] },
+				credential: await ctx.credential.resolve(
+					secret.gitHubAppTokenFromRepository(ctx.data.commit),
+				),
 			});
 
 			try {

lib/git.ts

@@ -72,7 +72,9 @@ export function nextPrereleaseTag(args: NextPrereleaseTagArgs): string {
 	return semver.inc(sortedTags[0], "prerelease");
 }
 
-export type EventSubscription = subscription.datalog.OnPush;
+export type EventSubscription =
+	| subscription.datalog.OnPush
+	| subscription.datalog.OnTag;
 
 /** Extract commit from event data. */
 export function eventCommit(data: EventSubscription): {
@@ -90,14 +92,12 @@ export function eventRepo(data: EventSubscription): {
 	defaultBranch?: string;
 	name?: string;
 	owner?: string;
-	installationToken: string;
 } {
 	return {
 		channels: [],
 		name: data.commit.repo.name,
 		owner: data.commit.repo.org.name,
 		defaultBranch: data.commit.repo.defaultBranch,
-		installationToken: data.commit.repo.org.installationToken,
 	};
 }
 
@@ -114,5 +114,5 @@ export function eventBranch(data: EventSubscription): string | undefined {
  * commit-triggered events.
  */
 export function eventTag(data: EventSubscription): string | undefined {
-	return undefined;
+	return (data as subscription.datalog.OnTag).ref?.name;
 }

package.json

@@ -49,7 +49,7 @@
     "test:one": "mocha --require espower-typescript/guess \"test/**/${TEST:-*.test.ts}\""
   },
   "dependencies": {
-    "@atomist/skill": "^0.12.0-main.20",
+    "@atomist/skill": "^0.12.0-main.25",
     "fs-extra": "^10.1.0",
     "p-retry": "^5.1.1",
     "semver": "^7.3.7"

skill.ts

@@ -145,4 +145,9 @@ export const Skill = skill<
 		},
 		repos: parameter.repoFilter(),
 	},
+
+	datalogSubscriptions: [
+		{ name: "build_on_push", query: "@atomist/skill/on_push" },
+		{ name: "build_on_tag", query: "@atomist/skill/on_tag" },
+	],
 });