mirror of
https://github.com/oven-sh/setup-bun.git
synced 2025-02-23 02:30:26 +08:00
fix: retry installing three times, add windows for testing (#72)
* ci: test windows * ci: specify shell * ci: we don't have >1.1.0 * fix: retry installing version three times * [autofix.ci] apply automated fixes * build: bump version to 1.2.1 * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
parent
9e6479509b
commit
932c3b236c
42
.github/workflows/test.yml
vendored
42
.github/workflows/test.yml
vendored
@ -22,12 +22,11 @@ jobs:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-latest
|
||||
- windows-latest
|
||||
bun-version:
|
||||
- latest
|
||||
- canary
|
||||
- "0.8.1" # last version before 1.0
|
||||
- "0.x"
|
||||
- "1.0.0"
|
||||
- "1.1.0"
|
||||
- "1.x"
|
||||
- "1"
|
||||
- "> 1.0.0"
|
||||
@ -38,10 +37,12 @@ jobs:
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Bun
|
||||
uses: ./
|
||||
with:
|
||||
bun-version: ${{ matrix.bun-version }}
|
||||
|
||||
- name: Run Bun
|
||||
run: |
|
||||
bun --version
|
||||
@ -52,28 +53,36 @@ jobs:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-latest
|
||||
- windows-latest
|
||||
packageManager:
|
||||
- bun@1.0.0
|
||||
- yarn@bun@1.0.0
|
||||
- bun@1.1.0
|
||||
- yarn@bun@1.1.0
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup package.json
|
||||
shell: bash
|
||||
run: |
|
||||
echo "$(jq '. += {"packageManager": "${{ matrix.packageManager }}"}' package.json)" > package.json
|
||||
|
||||
- name: Setup Bun
|
||||
uses: ./
|
||||
|
||||
- name: Run Bun
|
||||
id: bun
|
||||
shell: bash
|
||||
run: |
|
||||
bun --version
|
||||
echo "version=$(bun --version)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Check version
|
||||
shell: bash
|
||||
run: |
|
||||
if [[ "${{ steps.bun.outputs.version }}" == "1.0.0" ]]; then
|
||||
echo "Version is 1.0.0"
|
||||
if [[ "${{ steps.bun.outputs.version }}" == "1.1.0" ]]; then
|
||||
echo "Version is 1.1.0"
|
||||
else
|
||||
echo "Expected version to be 1.0.0, got ${{ steps.bun.outputs.version }}"
|
||||
echo "Expected version to be 1.1.0, got ${{ steps.bun.outputs.version }}"
|
||||
exit 1
|
||||
fi
|
||||
setup-bun-from-tool-versions:
|
||||
@ -83,27 +92,34 @@ jobs:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-latest
|
||||
- windows-latest
|
||||
content:
|
||||
- "bun 1.0.0"
|
||||
- "bun1.0.0"
|
||||
- "bun 1.1.0"
|
||||
- "bun1.1.0"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Setup package.json
|
||||
shell: bash
|
||||
run: |
|
||||
echo "bun ${{ matrix.content }}" > .tool-versions
|
||||
|
||||
- name: Setup Bun
|
||||
uses: ./
|
||||
|
||||
- name: Run Bun
|
||||
id: bun
|
||||
shell: bash
|
||||
run: |
|
||||
bun --version
|
||||
echo "version=$(bun --version)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Check version
|
||||
shell: bash
|
||||
run: |
|
||||
if [[ "${{ steps.bun.outputs.version }}" == "1.0.0" ]]; then
|
||||
echo "Version is 1.0.0"
|
||||
if [[ "${{ steps.bun.outputs.version }}" == "1.1.0" ]]; then
|
||||
echo "Version is 1.1.0"
|
||||
else
|
||||
echo "Expected version to be 1.0.0, got ${{ steps.bun.outputs.version }}"
|
||||
echo "Expected version to be 1.1.0, got ${{ steps.bun.outputs.version }}"
|
||||
exit 1
|
||||
fi
|
||||
|
64
dist/setup/index.js
generated
vendored
64
dist/setup/index.js
generated
vendored
File diff suppressed because one or more lines are too long
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "setup-bun",
|
||||
"version": "1.2.0",
|
||||
"version": "1.2.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "setup-bun",
|
||||
"version": "1.2.0",
|
||||
"version": "1.2.1",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@actions/cache": "^3.1.4",
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"private": true,
|
||||
"name": "setup-bun",
|
||||
"version": "1.2.0",
|
||||
"version": "1.2.1",
|
||||
"description": "Setup Bun on GitHub Actions.",
|
||||
"keywords": [
|
||||
"bun",
|
||||
|
@ -13,6 +13,7 @@ import { downloadTool, extractZip } from "@actions/tool-cache";
|
||||
import { getExecOutput } from "@actions/exec";
|
||||
import { writeBunfig } from "./bunfig";
|
||||
import { saveState } from "@actions/core";
|
||||
import { retry } from "./utils";
|
||||
|
||||
export type Input = {
|
||||
customUrl?: string;
|
||||
@ -86,17 +87,8 @@ export default async (options: Input): Promise<Output> => {
|
||||
|
||||
if (!cacheHit) {
|
||||
info(`Downloading a new version of Bun: ${url}`);
|
||||
const zipPath = await downloadTool(url);
|
||||
const extractedZipPath = await extractZip(zipPath);
|
||||
const extractedBunPath = await extractBun(extractedZipPath);
|
||||
try {
|
||||
renameSync(extractedBunPath, bunPath);
|
||||
} catch {
|
||||
// If mv does not work, try to copy the file instead.
|
||||
// For example: EXDEV: cross-device link not permitted
|
||||
copyFileSync(extractedBunPath, bunPath);
|
||||
}
|
||||
revision = await getRevision(bunPath);
|
||||
// TODO: remove this, temporary fix for https://github.com/oven-sh/setup-bun/issues/73
|
||||
revision = await retry(async () => await downloadBun(url, bunPath), 3);
|
||||
}
|
||||
|
||||
if (!revision) {
|
||||
@ -123,6 +115,24 @@ export default async (options: Input): Promise<Output> => {
|
||||
};
|
||||
};
|
||||
|
||||
async function downloadBun(
|
||||
url: string,
|
||||
bunPath: string
|
||||
): Promise<string | undefined> {
|
||||
const zipPath = await downloadTool(url);
|
||||
const extractedZipPath = await extractZip(zipPath);
|
||||
const extractedBunPath = await extractBun(extractedZipPath);
|
||||
try {
|
||||
renameSync(extractedBunPath, bunPath);
|
||||
} catch {
|
||||
// If mv does not work, try to copy the file instead.
|
||||
// For example: EXDEV: cross-device link not permitted
|
||||
copyFileSync(extractedBunPath, bunPath);
|
||||
}
|
||||
|
||||
return await getRevision(bunPath);
|
||||
}
|
||||
|
||||
function isCacheEnabled(options: Input): boolean {
|
||||
const { customUrl, version, noCache } = options;
|
||||
if (noCache) {
|
||||
|
8
src/utils.ts
Normal file
8
src/utils.ts
Normal file
@ -0,0 +1,8 @@
|
||||
export function retry<T>(fn: () => Promise<T>, retries: number): Promise<T> {
|
||||
return fn().catch((err) => {
|
||||
if (retries <= 0) {
|
||||
throw err;
|
||||
}
|
||||
return retry(fn, retries - 1);
|
||||
});
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user