Actually do caching

Signed-off-by: Taylor Smock <tsmock@meta.com>
JOSM · Oct 2, 2024 · ffac67d · ffac67d
1 parent bfd04bd
commit ffac67d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/actions/josm_plugin_dependencies/dist/index.js b/actions/josm_plugin_dependencies/dist/index.js
@@ -78365,6 +78365,17 @@ async function dependencies(pluginDir) {
  await (0,cache.saveCache)(corePaths, coreKey);
  }
  });
+ if ((0,external_fs_.existsSync)((0,external_path_.join)(pluginDir, "pom.xml"))) {
+ const mavenPluginCache = await (0,cache.restoreCache)(["~/.ivy2/cache", "~/.ant/cache", "~/.m2/repository"], `${process.platform}-${process.arch}-mvn-plugin-${await (0,glob.hashFiles)("josm/plugins/**/pom.xml\n" + "josm/plugins/**/ivy.xml")}`);
+ if (mavenPluginCache == null) {
+ await (0,exec.exec)("ant", [
+ "-buildfile",
+ (0,external_path_.join)(pluginDir, "build.xml"),
+ "fetch_dependencies",
+ ]);
+ await (0,cache.saveCache)(["~/.ivy2/cache/", "~/.ant/cache", "~/.m2/repository"], `${process.platform}-${process.arch}-mvn-plugin-${await (0,glob.hashFiles)("josm/plugins/**/pom.xml\n" + "josm/plugins/**/ivy.xml")}`);
+ }
+ }
  if ((0,external_fs_.existsSync)((0,external_path_.join)(pluginDir, "ivy.xml"))) {
  const ivyPluginCache = await (0,cache.restoreCache)(["~/.ivy2/cache", "~/.ant/cache"], `${process.platform}-${process.arch}-ivy-plugin-${await (0,glob.hashFiles)("josm/plugins/**/ivy.xml")}`);
  if (ivyPluginCache == null) {

diff --git a/actions/josm_plugin_dependencies/dist/index.js.map b/actions/josm_plugin_dependencies/dist/index.js.map
diff --git a/actions/josm_plugin_dependencies/src/action.ts b/actions/josm_plugin_dependencies/src/action.ts
@@ -54,6 +54,27 @@ async function dependencies(pluginDir: string): Promise<void> {
  await saveCache(corePaths, coreKey);
  }
  });
+ if (existsSync(join(pluginDir, "pom.xml"))) {
+ const mavenPluginCache = await restoreCache(
+ ["~/.ivy2/cache", "~/.ant/cache", "~/.m2/repository"],
+ `${process.platform}-${process.arch}-mvn-plugin-${await hashFiles(
+ "josm/plugins/**/pom.xml\n" + "josm/plugins/**/ivy.xml",
+ )}`,
+ );
+ if (mavenPluginCache == null) {
+ await exec("ant", [
+ "-buildfile",
+ join(pluginDir, "build.xml"),
+ "fetch_dependencies",
+ ]);
+ await saveCache(
+ ["~/.ivy2/cache/", "~/.ant/cache", "~/.m2/repository"],
+ `${process.platform}-${process.arch}-mvn-plugin-${await hashFiles(
+ "josm/plugins/**/pom.xml\n" + "josm/plugins/**/ivy.xml",
+ )}`,
+ );
+ }
+ }
  if (existsSync(join(pluginDir, "ivy.xml"))) {
  const ivyPluginCache = await restoreCache(
  ["~/.ivy2/cache", "~/.ant/cache"],