Improve change detection for feature branches (#16)

* Detect changes against configured base branch

* Update README and action.yml

* Add job.outputs example

* Update CHANGELOG

src/git.ts

@@ -1,15 +1,18 @@
 import {exec} from '@actions/exec'
 
-export async function fetchCommit(sha: string): Promise<void> {
-  const exitCode = await exec('git', ['fetch', '--depth=1', 'origin', sha])
+export const NULL_SHA = '0000000000000000000000000000000000000000'
+export const FETCH_HEAD = 'FETCH_HEAD'
+
+export async function fetchCommit(ref: string): Promise<void> {
+  const exitCode = await exec('git', ['fetch', '--depth=1', '--no-tags', 'origin', ref])
   if (exitCode !== 0) {
-    throw new Error(`Fetching commit ${sha} failed`)
+    throw new Error(`Fetching ${ref} failed`)
   }
 }
 
-export async function getChangedFiles(sha: string): Promise<string[]> {
+export async function getChangedFiles(ref: string): Promise<string[]> {
   let output = ''
-  const exitCode = await exec('git', ['diff-index', '--name-only', sha], {
+  const exitCode = await exec('git', ['diff-index', '--name-only', ref], {
     listeners: {
       stdout: (data: Buffer) => (output += data.toString())
     }
@@ -24,3 +27,20 @@ export async function getChangedFiles(sha: string): Promise<string[]> {
     .map(s => s.trim())
     .filter(s => s.length > 0)
 }
+
+export function isTagRef(ref: string): boolean {
+  return ref.startsWith('refs/tags/')
+}
+
+export function trimRefs(ref: string): string {
+  return trimStart(ref, 'refs/')
+}
+
+export function trimRefsHeads(ref: string): string {
+  const trimRef = trimStart(ref, 'refs/')
+  return trimStart(trimRef, 'heads/')
+}
+
+function trimStart(ref: string, start: string): string {
+  return ref.startsWith(start) ? ref.substr(start.length) : ref
+}

src/main.ts

@@ -15,9 +15,17 @@ async function run(): Promise<void> {
     const filter = new Filter(filtersYaml)
     const files = await getChangedFiles(token)
 
-    const result = filter.match(files)
-    for (const key in result) {
-      core.setOutput(key, String(result[key]))
+    if (files === null) {
+      // Change detection was not possible
+      // Set all filter keys to true (i.e. changed)
+      for (const key in filter.rules) {
+        core.setOutput(key, String(true))
+      }
+    } else {
+      const result = filter.match(files)
+      for (const key in result) {
+        core.setOutput(key, String(result[key]))
+      }
     }
   } catch (error) {
     core.setFailed(error.message)
@@ -40,23 +48,45 @@ function getConfigFileContent(configPath: string): string {
   return fs.readFileSync(configPath, {encoding: 'utf8'})
 }
 
-async function getChangedFiles(token: string): Promise<string[]> {
+async function getChangedFiles(token: string): Promise<string[] | null> {
   if (github.context.eventName === 'pull_request') {
     const pr = github.context.payload.pull_request as Webhooks.WebhookPayloadPullRequestPullRequest
     return token ? await getChangedFilesFromApi(token, pr) : await getChangedFilesFromGit(pr.base.sha)
   } else if (github.context.eventName === 'push') {
-    const push = github.context.payload as Webhooks.WebhookPayloadPush
-    return await getChangedFilesFromGit(push.before)
+    return getChangedFilesFromPush()
   } else {
     throw new Error('This action can be triggered only by pull_request or push event')
   }
 }
 
+async function getChangedFilesFromPush(): Promise<string[] | null> {
+  const push = github.context.payload as Webhooks.WebhookPayloadPush
+
+  // No change detection for pushed tags
+  if (git.isTagRef(push.ref)) return null
+
+  // Get base from input or use repo default branch.
+  // It it starts with 'refs/', it will be trimmed (git fetch refs/heads/<NAME> doesn't work)
+  const baseInput = git.trimRefs(core.getInput('base', {required: false}) || push.repository.default_branch)
+
+  // If base references same branch it was pushed to, we will do comparison against the previously pushed commit.
+  // Otherwise changes are detected against the base reference
+  const base = git.trimRefsHeads(baseInput) === git.trimRefsHeads(push.ref) ? push.before : baseInput
+
+  // There is no previous commit for comparison
+  // e.g. change detection against previous commit of just pushed new branch
+  if (base === git.NULL_SHA) return null
+
+  return await getChangedFilesFromGit(base)
+}
+
 // Fetch base branch and use `git diff` to determine changed files
-async function getChangedFilesFromGit(sha: string): Promise<string[]> {
+async function getChangedFilesFromGit(ref: string): Promise<string[]> {
   core.debug('Fetching base branch and using `git diff-index` to determine changed files')
-  await git.fetchCommit(sha)
-  return await git.getChangedFiles(sha)
+  await git.fetchCommit(ref)
+  // FETCH_HEAD will always point to the just fetched commit
+  // No matter if ref is SHA, branch or tag name or full git ref
+  return await git.getChangedFiles(git.FETCH_HEAD)
 }
 
 // Uses github REST api to get list of files changed in PR