fix(github-action): set author/comitter

jsonnet-libs · Jul 2, 2021 · 333bad5 · 333bad5
1 parent 85ce9dd
commit 333bad5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,6 +8,8 @@
     - "uses": "actions/checkout@v2"
     - "env":
         "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}"
+        "GIT_COMMITTER_EMAIL": "[email protected]"
+        "GIT_COMMITTER_NAME": "jsonnet-libs-bot"
         "SSH_KEY": "${{ secrets.DEPLOY_KEY }}"
       "run": "make build libs/cert-manager"
   "cnrm":
@@ -18,6 +20,8 @@
     - "uses": "actions/checkout@v2"
     - "env":
         "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}"
+        "GIT_COMMITTER_EMAIL": "[email protected]"
+        "GIT_COMMITTER_NAME": "jsonnet-libs-bot"
         "SSH_KEY": "${{ secrets.DEPLOY_KEY }}"
       "run": "make build libs/cnrm"
   "crossplane":
@@ -28,6 +32,8 @@
     - "uses": "actions/checkout@v2"
     - "env":
         "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}"
+        "GIT_COMMITTER_EMAIL": "[email protected]"
+        "GIT_COMMITTER_NAME": "jsonnet-libs-bot"
         "SSH_KEY": "${{ secrets.DEPLOY_KEY }}"
       "run": "make build libs/crossplane"
   "debugging":
@@ -48,6 +54,8 @@
     - "uses": "actions/checkout@v2"
     - "env":
         "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}"
+        "GIT_COMMITTER_EMAIL": "[email protected]"
+        "GIT_COMMITTER_NAME": "jsonnet-libs-bot"
         "SSH_KEY": "${{ secrets.DEPLOY_KEY }}"
       "run": "make build libs/istio"
   "k8s":
@@ -58,6 +66,8 @@
     - "uses": "actions/checkout@v2"
     - "env":
         "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}"
+        "GIT_COMMITTER_EMAIL": "[email protected]"
+        "GIT_COMMITTER_NAME": "jsonnet-libs-bot"
         "SSH_KEY": "${{ secrets.DEPLOY_KEY }}"
       "run": "make build libs/k8s"
   "repos":

diff --git a/Makefile b/Makefile
@@ -10,6 +10,10 @@ IMPORTS=$(shell find libs -name config.jsonnet | xargs -I {} echo "(import '{}')
 PAGES ?= false
 GEN_COMMIT ?= false
 GITHUB_SHA ?= $(shell git rev-parse HEAD)
+GIT_AUTHOR_NAME ?= $(shell git --no-pager log --format=format:'%an' -n 1)
+GIT_AUTHOR_EMAIL ?= $(shell git --no-pager log --format=format:'%ae' -n 1)
+GIT_COMITTER_NAME ?= $(shell git --no-pager log --format=format:'%an' -n 1)
+GIT_COMITTER_EMAIL ?= $(shell git --no-pager log --format=format:'%ae' -n 1)
 
 .DEFAULT_GOAL: default
 default:
@@ -48,6 +52,10 @@ libs/*:
 		-v $(ABS_OUTPUT_DIR):/output \
 		-e GEN_COMMIT="$(GEN_COMMIT)" \
 		-e GITHUB_SHA="$(GITHUB_SHA)" \
+		-e GIT_AUTHOR_NAME="$(GIT_AUTHOR_NAME)" \
+		-e GIT_AUTHOR_EMAIL="$(GIT_AUTHOR_EMAIL)" \
+		-e GIT_COMITTER_NAME="$(GIT_COMITTER_NAME)" \
+		-e GIT_COMITTER_EMAIL="$(GIT_COMITTER_EMAIL)" \
 		-e SSH_KEY="$${SSH_KEY}" \
 		$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) /config /output
 

diff --git a/jsonnet/github_action.jsonnet b/jsonnet/github_action.jsonnet
@@ -55,6 +55,8 @@ local libJob(name) = {
     {
       run: 'make build libs/' + name,
       env: {
+        GIT_COMMITTER_NAME: 'jsonnet-libs-bot',
+        GIT_COMMITTER_EMAIL: '[email protected]',
         SSH_KEY: '${{ secrets.DEPLOY_KEY }}',
         GEN_COMMIT: "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}",
       },

diff --git a/scripts/configure_github_ssh.sh b/scripts/configure_github_ssh.sh
@@ -5,11 +5,14 @@ set -x
 DIRNAME="$1"
 
 mkdir "${DIRNAME}"/ssh
+
 echo "${SSH_KEY}" > "${DIRNAME}"/ssh/id_rsa
 echo "Host github.com" > "${DIRNAME}"/ssh/config
 echo "  IdentityFile ${DIRNAME}/ssh/id_rsa" >> "${DIRNAME}"/ssh/config
 echo "  UserKnownHostsFile ${DIRNAME}/ssh/known_hosts" >> "${DIRNAME}"/ssh/config
 cat "${DIRNAME}"/ssh/config
+
 ssh-keyscan github.com >> "${DIRNAME}"/ssh/known_hosts
+
 chmod 700 -R "${DIRNAME}"/ssh
 chmod 600 "${DIRNAME}"/ssh/id_rsa