fix: add support for binary files (#22)

* ci: add a PNG to the integration test

* fix: add support for binary files

---------

Co-authored-by: Marcus Aspin <[email protected]>

Author: dsanders11

.github/workflows/integration-tests.yml

@@ -42,10 +42,14 @@ jobs:
         run: |
           date > current-date.txt
           echo 'foobar' > README.md
+          curl -o git-logo.png https://git-scm.com/images/logos/downloads/Git-Icon-1788C.png
+          GIT_LOGO_SHA=$(git hash-object -t blob git-logo.png)
+          mv git-logo.png "git-logo-${GIT_LOGO_SHA}.png"
           git add current-date.txt
           git add README.md
           git rm LICENSE
           git add --chmod=+x src/lib.ts
+          git add "git-logo-${GIT_LOGO_SHA}.png"
 
       - name: Commit to new ref
         uses: ./
@@ -79,6 +83,18 @@ jobs:
               assert.strictEqual(data.sha, '${{ steps.commit-new-ref.outputs.sha }}', 'Expected sha for commit to match');
               assert.strictEqual(data.commit.message, message, 'Expected commit message to match');
               assert.strictEqual(data.commit.verification.verified, true, 'Expected commit to be verified');
+
+              const { data: { tree } } = await github.rest.git.getTree({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                tree_sha: ref,
+              });
+
+              const filenameRegex = /git-logo-(\S+).png/;
+              const { path, sha } = tree.find(({ path }) => filenameRegex.test(path));
+              const [, expectedSha] = path.match(filenameRegex);
+
+              assert.strictEqual(sha, expectedSha, 'Expected SHA for Git logo PNG to match');
             }
 
       - name: Update checkout

dist/index.js

@@ -9,9 +9,12 @@ import type { Endpoints } from '@octokit/types';
 
 import { getHeadRef, getHeadSha, getHeadTreeHash, getStagedFiles } from './lib';
 
-export async function populateTree(): Promise<
-  Endpoints['POST /repos/{owner}/{repo}/git/trees']['parameters']['tree']
-> {
+type GitHubGitTreeType =
+  Endpoints['POST /repos/{owner}/{repo}/git/trees']['parameters']['tree'];
+type GitTreeItem = Omit<GitHubGitTreeType[0], 'content'> & { content?: Buffer };
+type GitTree = GitTreeItem[];
+
+export async function populateTree(): Promise<GitTree> {
   return (await getStagedFiles()).map(
     ({ oldMode, mode, oldSha, sha, change, filename }) => {
       if (change === 'D') {
@@ -47,7 +50,7 @@ export async function populateTree(): Promise<
           path: filename,
           mode,
           type: 'blob',
-          content: fs.readFileSync(path.join(process.cwd(), filename), 'utf-8')
+          content: fs.readFileSync(path.join(process.cwd(), filename))
         };
       }
     }
@@ -84,10 +87,26 @@ export async function run(): Promise<void> {
     const repo = github.context.repo.repo;
     const octokit = github.getOctokit(token, { log: console });
 
+    // Upload file contents as blobs and update the tree with the returned SHAs
+    for (const item of tree) {
+      if (item.content) {
+        const blob = await octokit.rest.git.createBlob({
+          owner,
+          repo,
+          content: item.content.toString('base64'),
+          encoding: 'base64'
+        });
+
+        item.content = undefined;
+        item.sha = blob.data.sha;
+        core.debug(`File SHA: ${item.path} ${blob.data.sha}`);
+      }
+    }
+
     const newTree = await octokit.rest.git.createTree({
       owner,
       repo,
-      tree,
+      tree: tree as GitHubGitTreeType,
       base_tree: await getHeadTreeHash()
     });
     core.debug(`New tree SHA: ${newTree.data.sha}`);