Fix determining version

.github/workflows/check-dist.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set Node.js 20.x
         uses: actions/setup-node@v3

.github/workflows/checks.yml

@@ -13,7 +13,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 20.x
@@ -26,19 +26,16 @@ jobs:
         run: npm run fmt:check
 
   test-action:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get scarb version
         id: extractScarbVersion
         shell: bash
         run: |
           snfoundry_version=$(curl -s https://api.github.com/repos/foundry-rs/starknet-foundry/releases/latest | grep tarball_url | awk -F '/' '{print $8}' | tr -d '",')
-          version=$(curl -s https://raw.githubusercontent.com/foundry-rs/starknet-foundry/$snfoundry_version/.tool-versions | awk '{print $2}')
+          version=$(curl -s https://raw.githubusercontent.com/foundry-rs/starknet-foundry/$snfoundry_version/.tool-versions | grep '^scarb' | awk '{print $2}')
 
           echo "scarbVersion=$version" >> "$GITHUB_OUTPUT"
       - name: Setup Scarb
@@ -62,12 +59,9 @@ jobs:
         working-directory: myproject
 
   test-action-with-tools-file:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Create .tool-versions file"
         shell: bash
@@ -81,3 +75,31 @@ jobs:
 
       - run: snforge --version | grep "snforge 0.16.0"
         shell: bash
+
+  test-action-with-fixed-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Setup Scarb
+        uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: 2.9.4
+
+      - name: "Setup foundry using fixed version"
+        uses: ./
+        with:
+          starknet-foundry-version: 0.44.0
+
+      - name: Verify snforge version
+        run: |
+          EXPECTED="snforge 0.44.0"
+          VERSION=$(snforge --version)
+
+          echo "Expected version: $EXPECTED"
+          echo "Actual version:   $VERSION"
+
+          if [[ "$VERSION" != "$EXPECTED" ]]; then
+            echo "Version mismatch"
+            exit 1
+          fi

action.yml

@@ -25,3 +25,6 @@ runs:
     - name: Set up Starknet Foundry
       shell: bash
       run: node $GITHUB_ACTION_PATH/dist/index.js
+      env:
+        INPUT_STARKNET-FOUNDRY-VERSION: ${{ inputs.starknet-foundry-version }}
+        INPUT_TOOL-VERSIONS: ${{ inputs.tool-versions }}

dist/index.js

@@ -29819,40 +29819,28 @@ async function getFullVersionFromStarknetFoundry() {
   return match[1];
 }
 
-async function determineVersion(version, toolVersionsPath, repo) {
-  version = version?.trim();
+async function determineVersion(
+  versionFromInput,
+  toolVersionsPath,
+  repo,
+) {
+  const versionFromFile = toolVersionsPath
+    ? await getVersionFromToolVersionsFile(toolVersionsPath)
+    : await getVersionFromToolVersionsFile();
 
-  if (version && toolVersionsPath) {
+  if (versionFromInput && toolVersionsPath) {
     throw new Error(
-      "the `starknet-foundry-version` and `tool-versions` inputs cannot be used simultaneously",
+      "`starknet-foundry-version` and `tool-versions` inputs cannot be used simultaneously",
     );
   }
 
-  if (toolVersionsPath) {
-    let toolVersion = await getVersionFromToolVersionsFile(toolVersionsPath);
-
-    if (!toolVersion) {
-      throw new Error(
-        `failed to read Starknet Foundry version from: ${toolVersionsPath}`,
-      );
-    }
-    version = toolVersion;
-  }
-
-  if (!version) {
-    let toolVersion = await getVersionFromToolVersionsFile();
-    version = toolVersion ?? "latest";
-  }
+  let version = versionFromInput || versionFromFile || "latest";
 
   if (version === "latest") {
     version = await fetchLatestTag(repo);
   }
 
-  if (version.startsWith("v")) {
-    version = version.substring(1);
-  }
-
-  return version;
+  return version.startsWith("v") ? version.slice(1) : version;
 }
 
 function fetchLatestTag(repo) {

lib/versions.js

@@ -14,40 +14,28 @@ export async function getFullVersionFromStarknetFoundry() {
   return match[1];
 }
 
-export async function determineVersion(version, toolVersionsPath, repo) {
-  version = version?.trim();
-
-  if (version && toolVersionsPath) {
+export async function determineVersion(
+  versionFromInput,
+  toolVersionsPath,
+  repo,
+) {
+  const versionFromFile = toolVersionsPath
+    ? await getVersionFromToolVersionsFile(toolVersionsPath)
+    : await getVersionFromToolVersionsFile();
+
+  if (versionFromInput && toolVersionsPath) {
     throw new Error(
-      "the `starknet-foundry-version` and `tool-versions` inputs cannot be used simultaneously",
+      "`starknet-foundry-version` and `tool-versions` inputs cannot be used simultaneously",
     );
   }
 
-  if (toolVersionsPath) {
-    let toolVersion = await getVersionFromToolVersionsFile(toolVersionsPath);
-
-    if (!toolVersion) {
-      throw new Error(
-        `failed to read Starknet Foundry version from: ${toolVersionsPath}`,
-      );
-    }
-    version = toolVersion;
-  }
-
-  if (!version) {
-    let toolVersion = await getVersionFromToolVersionsFile();
-    version = toolVersion ?? "latest";
-  }
+  let version = versionFromInput || versionFromFile || "latest";
 
   if (version === "latest") {
     version = await fetchLatestTag(repo);
   }
 
-  if (version.startsWith("v")) {
-    version = version.substring(1);
-  }
-
-  return version;
+  return version.startsWith("v") ? version.slice(1) : version;
 }
 
 function fetchLatestTag(repo) {