feat: add .tool-versions and .dvmrc support (#61)

---------

Signed-off-by: Jesse Dijkstra <mail@jessedijkstra.nl>
Co-authored-by: Yoshiya Hinosawa <stibium121@gmail.com>
This commit is contained in:
Jesse Dijkstra 2024-07-05 08:33:22 +02:00 committed by GitHub
parent 041b854f97
commit edde9366ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 84 additions and 3 deletions

1
.dvmrc Normal file
View File

@ -0,0 +1 @@
1.43.1

View File

@ -13,7 +13,7 @@ jobs:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macos-latest] os: [ubuntu-latest, windows-latest, macos-latest]
deno: deno:
[1.x, "1.33.1", canary, ~1.32, b31cf9fde6ad5398c20370c136695db77df6beeb] [1.x, "1.33.1", canary, ~1.32, b290fd01f3f5d32f9d010fc719ced0240759c049]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -38,3 +38,19 @@ jobs:
- name: Lint - name: Lint
if: runner.os == 'Linux' && matrix.deno == 'canary' if: runner.os == 'Linux' && matrix.deno == 'canary'
run: npm run lint run: npm run lint
test-version-file:
runs-on: ubuntu-latest
strategy:
matrix:
deno-version-file: [.dvmrc, .tool-versions]
steps:
- uses: actions/checkout@v3
- name: Setup Deno
uses: ./
with:
deno-version-file: ${{ matrix.deno-version-file }}
- name: Check version
run: deno -V | grep -q "deno 1\.43\.1"

7
.tool-versions Normal file
View File

@ -0,0 +1,7 @@
nodejs 20.5.1
bun 1.1.4
ruby 3.3.0
lua 5.4.4
deno 1.43.1
rust 1.65.0
python 3.11.0

View File

@ -4,6 +4,20 @@ Set up your GitHub Actions workflow with a specific version of Deno.
## Usage ## Usage
### Version from file
```yaml
- uses: denoland/setup-deno@v1
with:
deno-version-file: .dvmrc
```
```yaml
- uses: denoland/setup-deno@v1
with:
deno-version-file: .tool-versions
```
### Latest stable for a major ### Latest stable for a major
```yaml ```yaml

View File

@ -8,6 +8,8 @@ inputs:
deno-version: deno-version:
description: The Deno version to install. Can be a semver version of a stable release, "canary" for the latest canary, or the Git hash of a specific canary release. description: The Deno version to install. Can be a semver version of a stable release, "canary" for the latest canary, or the Git hash of a specific canary release.
default: "1.x" default: "1.x"
deno-version-file:
description: File containing the Deno version to install such as .dvmrc or .tool-versions.
outputs: outputs:
deno-version: deno-version:
description: "The Deno version that was installed." description: "The Deno version that was installed."

14
main.js
View File

@ -1,7 +1,11 @@
const process = require("process"); const process = require("process");
const core = require("@actions/core"); const core = require("@actions/core");
const { parseVersionRange, resolveVersion } = require("./src/version.js"); const {
parseVersionRange,
getDenoVersionFromFile,
resolveVersion,
} = require("./src/version.js");
const { install } = require("./src/install.js"); const { install } = require("./src/install.js");
/** /**
@ -15,7 +19,13 @@ function exit(message) {
async function main() { async function main() {
try { try {
const range = parseVersionRange(core.getInput("deno-version")); const denoVersionFile = core.getInput("deno-version-file");
const range = parseVersionRange(
denoVersionFile
? getDenoVersionFromFile(denoVersionFile)
: core.getInput("deno-version"),
);
if (range === null) { if (range === null) {
exit("The passed version range is not valid."); exit("The passed version range is not valid.");
} }

View File

@ -1,5 +1,6 @@
const semver = require("semver"); const semver = require("semver");
const { fetch } = require("undici"); const { fetch } = require("undici");
const fs = require("fs");
const GIT_HASH_RE = /^[0-9a-fA-F]{40}$/; const GIT_HASH_RE = /^[0-9a-fA-F]{40}$/;
@ -41,6 +42,35 @@ function parseVersionRange(version) {
return null; return null;
} }
/**
* Parses the version from the version file
*
* @param {string} versionFilePath
* @returns {string | undefined}
*/
function getDenoVersionFromFile(versionFilePath) {
if (!fs.existsSync(versionFilePath)) {
throw new Error(
`The specified node version file at: ${versionFilePath} does not exist`,
);
}
const contents = fs.readFileSync(versionFilePath, "utf8");
// .tool-versions typically looks like
// ```
// ruby 2.6.5
// deno 1.43.1
// node 20.0.0
// ```
// This parses the version of Deno from the file
const denoVersionInToolVersions = contents.match(
/^deno\s+v?(?<version>[^\s]+)$/m,
);
return denoVersionInToolVersions?.groups?.version || contents.trim();
}
/** /**
* @param {VersionRange} range * @param {VersionRange} range
* @returns {Promise<Version | null>} * @returns {Promise<Version | null>}
@ -115,4 +145,5 @@ async function fetchWithRetries(url, maxRetries = 5) {
module.exports = { module.exports = {
parseVersionRange, parseVersionRange,
resolveVersion, resolveVersion,
getDenoVersionFromFile,
}; };