Don't assume trigger sha is last commit

Signed-off-by: Joshua Castle <[email protected]>

Author: Kas-tle

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
     needs: release
 
     steps:
-    - uses: Kas-tle/release-build-log-action@46873b93db54b63e3d412ff7be96261c3593674c
+    - uses: Kas-tle/release-build-log-action@1b57448eaf9476e6e05450e4ea240449eac2c0d2
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         releaseID: ${{ needs.release.outputs.release_id }}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "base-release-action",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "description": "An action to create incremented releases in a similar style to Jenkins",
     "repository": "https://github.com/Kas-tle/base-release-action.git",
     "author": "Joshua Castle <[email protected]",

src/action/inputs.ts

@@ -119,13 +119,13 @@ async function getChanges(api: OctokitApi, prevRelease: PreviousRelease, repoDat
 
     if (prevRelease.commit == null) {
         if (branch === defaultBranch) {
-            firstCommit = `${process.env.GITHUB_SHA!}^`;
+            firstCommit = `${lastCommit}^`;
         } else {
             const compareReponse = await api.rest.repos.compareCommits({ owner: repoData.owner, repo: repoData.repo, base: defaultBranch, head: branch });
             try {
                 firstCommit = `${compareReponse.data.commits[0].sha}^`;
             } catch (error) {
-                firstCommit = `${process.env.GITHUB_SHA!}^`;
+                firstCommit = `${lastCommit}^`;
             }
         }
     } else {

src/action/store.ts

@@ -5,27 +5,28 @@ import { Repo } from "../types/repo";
 import { isDeepStrictEqual } from 'util';
 
 export async function storeReleaseData(inputs: Inputs, api: OctokitApi, repoData: Repo) {
-    let updated = await checkStoreReleaseData(inputs, api, repoData);
+    const lastCommit = inputs.changes[inputs.changes.length - 1].commit;
+    let updated = await checkStoreReleaseData(inputs, api, repoData, lastCommit);
 
     let retries = 0;
     while (!updated && retries < 10) {
         console.log(`Previous release data not updated, retrying in 5 seconds...`);
         await new Promise(resolve => setTimeout(resolve, 5000));
-        updated = await checkStoreReleaseData(inputs, api, repoData);
+        updated = await checkStoreReleaseData(inputs, api, repoData, lastCommit);
         retries++;
 
         if (retries === 10) {
             core.setFailed(`Previous release data not updated after 10 retries`);
         }
     }
 
-    console.log(`Updated previous commit ${process.env.GITHUB_SHA!}`);
+    console.log(`Updated previous commit ${lastCommit}`);
     console.log(`Updated previous base tag to ${inputs.tag.base}`);
 }
 
-async function checkStoreReleaseData(inputs: Inputs, api: OctokitApi, repoData: Repo): Promise<boolean> {
+async function checkStoreReleaseData(inputs: Inputs, api: OctokitApi, repoData: Repo, lastCommit: string): Promise<boolean> {
     const { owner, repo, branch } = repoData;
-    const newEntry = { c: process.env.GITHUB_SHA!, t: inputs.tag.base };
+    const newEntry = { c: lastCommit, t: inputs.tag.base };
 
     const variable = 'releaseAction_prevRelease';
     const varResponse = await api.rest.actions.getRepoVariable({ owner, repo, name: variable });