From 9dee09156d549f9691a9ec4c4f6b861f6621104f Mon Sep 17 00:00:00 2001
From: Will Norris <will@tailscale.com>
Date: Fri, 26 Aug 2022 16:36:26 -0700
Subject: [PATCH] .github/actions: signoff go-licenses commits

Also ignore tailscale.com package (and add directly to template) and
remove branch-suffix. This aligns android with other go-license
workflows.

Signed-off-by: Will Norris <will@tailscale.com>
---
 .github/licenses.tmpl             | 1 +
 .github/workflows/go-licenses.yml | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/licenses.tmpl b/.github/licenses.tmpl
index d9b242b..88f6f52 100644
--- a/.github/licenses.tmpl
+++ b/.github/licenses.tmpl
@@ -17,3 +17,4 @@ Client][].  See also the dependencies in the [Tailscale CLI][].
 {{ range . }}
  - [{{.Name}}](https://pkg.go.dev/{{.Name}}) ([{{.LicenseName}}]({{.LicenseURL}}))
 {{- end }}
+ - [tailscale.com](https://pkg.go.dev/tailscale.com) ([BSD-3-Clause](https://github.com/tailscale/tailscale/blob/HEAD/LICENSE))
diff --git a/.github/workflows/go-licenses.yml b/.github/workflows/go-licenses.yml
index d739eab..b35a040 100644
--- a/.github/workflows/go-licenses.yml
+++ b/.github/workflows/go-licenses.yml
@@ -17,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  licenses:
+  android:
     runs-on: ubuntu-latest
 
     steps:
@@ -41,7 +41,7 @@ jobs:
 
       - name: Run go-licenses
         run: |
-          go-licenses report ./cmd/tailscale --template .github/licenses.tmpl | tee oss/licenses/android.md
+          go-licenses report ./cmd/tailscale --template .github/licenses.tmpl --ignore tailscale.com | tee oss/licenses/android.md
 
       - name: Get access token
         uses: tibdex/github-app-token@f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06 # v1.6.0
@@ -57,10 +57,11 @@ jobs:
           token: ${{ steps.generate-token.outputs.token }}
           path: oss
           author: License Updater <noreply@tailscale.com>
+          Committer: License Updater <noreply@tailscale.com>
           branch: licenses/android
-          branch-suffix: short-commit-hash
           commit-message: "licenses: update android licenses"
           title: "licenses: update android licenses"
           body: Triggered by ${{ github.repository }}@${{ github.sha }}
+          signoff: true
           delete-branch: true
           team-reviewers: opensource-license-reviewers