From 1442fa4f5e3b3bf48bec5ad0865d03c60b9d04d2 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sun, 18 Jun 2023 01:04:14 +0200
Subject: [PATCH] Add debug print of input of state hash
---
packed/index.js | 9 +++++----
src/main.ts | 10 ++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/packed/index.js b/packed/index.js
index 922b15e..6cb76c1 100644
--- a/packed/index.js
+++ b/packed/index.js
@@ -171,6 +171,7 @@ function calculate_state_hash(sdl_git_hash) {
...misc_state,
];
const state_string = complete_state.join("##");
+ core.debug(`state_string=${state_string}`);
return crypto.createHash("sha256").update(state_string).digest("hex");
}
async function run() {
@@ -215,13 +216,13 @@ async function run() {
git_branch_hash = sdl_release.tag;
}
}
- const git_hash = await convert_git_branch_tag_to_hash(git_branch_hash);
- const STATE_HASH = calculate_state_hash(git_hash);
- core.info(`Hash is ${STATE_HASH}`);
+ const GIT_HASH = await convert_git_branch_tag_to_hash(git_branch_hash);
+ const STATE_HASH = calculate_state_hash(GIT_HASH);
+ core.info(`setup-sdl state = ${STATE_HASH}`);
const SOURCE_DIR = `${SETUP_SDL_ROOT}/${STATE_HASH}/source`;
const BUILD_DIR = `${SETUP_SDL_ROOT}/${STATE_HASH}/build`;
const PACKAGE_DIR = `${SETUP_SDL_ROOT}/${STATE_HASH}/package`;
- await checkout_sdl_git_hash(git_hash, SOURCE_DIR);
+ await checkout_sdl_git_hash(GIT_HASH, SOURCE_DIR);
const SDL_VERSION = version_1.SdlVersion.detect_sdl_version_from_source_tree(SOURCE_DIR);
core.info(`SDL version is ${SDL_VERSION.toString()}`);
const CACHE_KEY = `setup-sdl-${STATE_HASH}`;
diff --git a/src/main.ts b/src/main.ts
index 0b7b2b6..83b1465 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -135,6 +135,8 @@ function calculate_state_hash(sdl_git_hash: string) {
const state_string = complete_state.join("##");
+ core.debug(`state_string=${state_string}`);
+
return crypto.createHash("sha256").update(state_string).digest("hex");
}
@@ -192,18 +194,18 @@ async function run() {
}
}
- const git_hash: string = await convert_git_branch_tag_to_hash(
+ const GIT_HASH: string = await convert_git_branch_tag_to_hash(
git_branch_hash
);
- const STATE_HASH = calculate_state_hash(git_hash);
- core.info(`Hash is ${STATE_HASH}`);
+ const STATE_HASH = calculate_state_hash(GIT_HASH);
+ core.info(`setup-sdl state = ${STATE_HASH}`);
const SOURCE_DIR = `${SETUP_SDL_ROOT}/${STATE_HASH}/source`;
const BUILD_DIR = `${SETUP_SDL_ROOT}/${STATE_HASH}/build`;
const PACKAGE_DIR = `${SETUP_SDL_ROOT}/${STATE_HASH}/package`;
- await checkout_sdl_git_hash(git_hash, SOURCE_DIR);
+ await checkout_sdl_git_hash(GIT_HASH, SOURCE_DIR);
const SDL_VERSION =
SdlVersion.detect_sdl_version_from_source_tree(SOURCE_DIR);