diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b5acf67..93784bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -168,8 +168,13 @@ jobs: run: | bun --version +<<<<<<< HEAD setup-bun-registry: name: setup-bun registry (${{ matrix.os }}) +======= + setup-bun-jsr-registry: + name: setup-bun jsr registry (${{ matrix.os }}) +>>>>>>> 9de686f (ci: jsr registry test) runs-on: ${{ matrix.os }} continue-on-error: true needs: [remove-cache, tests] @@ -191,13 +196,22 @@ jobs: registries: | [ { +<<<<<<< HEAD "url": "https://username:password@registry.myorg.com/", "scope": "@myorg" +======= + "url": "https://npm.jsr.io" + "scope": "@jsr" +>>>>>>> 9de686f (ci: jsr registry test) } ] - name: Run Bun id: run_bun run: | +<<<<<<< HEAD bun --version bun add @myorg/example +======= + bun add @luca/runtime-detector +>>>>>>> 9de686f (ci: jsr registry test) diff --git a/tests/bunfig.spec.ts b/tests/bunfig.spec.ts index c03b6bc..924026e 100644 --- a/tests/bunfig.spec.ts +++ b/tests/bunfig.spec.ts @@ -35,6 +35,7 @@ describe("writeBunfig", () => { const expectedContents = [ "[install.scopes]", '\'@foo-bar\' = { url = "https://npm.pkg.github.com/", token = "$BUN_AUTH_TOKEN" }', +<<<<<<< HEAD "", ]; @@ -61,6 +62,8 @@ describe("writeBunfig", () => { const expectedContents = [ "[install]", 'registry = "https://npm.pkg.github.com/"', +======= +>>>>>>> 9de686f (ci: jsr registry test) "", ]; @@ -194,6 +197,7 @@ describe("writeBunfig", () => { "", "[install.scopes]", '\'@foo-bar\' = { url = "https://npm.pkg.github.com/", token = "$BUN_AUTH_TOKEN" }', +<<<<<<< HEAD '\'@bla-ble\' = { token = "$BUN_AUTH_TOKEN", url = "https://npm.pkg.github.com/" }', "", "[install.cache]", @@ -237,6 +241,8 @@ describe("writeBunfig", () => { "", "[install.scopes]", '\'@foo-bar\' = { url = "https://npm.pkg.github.com/", token = "$BUN_AUTH_TOKEN" }', +======= +>>>>>>> 9de686f (ci: jsr registry test) '\'@bla-ble\' = { token = "$BUN_AUTH_TOKEN", url = "https://npm.pkg.github.com/" }', "", "[install.cache]", @@ -279,7 +285,7 @@ describe("writeBunfig", () => { "optional = true", "", "[install.scopes]", - '\'@foo-bar\' = { token = "$BUN_AUTH_TOKEN", url = "https://npm.pkg.github.com/" }', + '\'@foo-bar\' = { url = "https://npm.pkg.github.com/", token = "$BUN_AUTH_TOKEN" }', '\'@bla-ble\' = { token = "$BUN_AUTH_TOKEN", url = "https://npm.pkg.github.com/" }', "", "[install.cache]",