aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ashcon Partovi <ashcon@partovi.net> 2023-01-27 20:53:03 -0800
committerGravatar Ashcon Partovi <ashcon@partovi.net> 2023-01-27 20:53:09 -0800
commit309b741aa18d71566fa3a25260b7049cdb954bae (patch)
tree88e18390189223e6004e91c74db496a609ce65ae
parentd90a00857ba69c42afe7bee06fef6738a29b26bd (diff)
downloadbun-309b741aa18d71566fa3a25260b7049cdb954bae.tar.gz
bun-309b741aa18d71566fa3a25260b7049cdb954bae.tar.zst
bun-309b741aa18d71566fa3a25260b7049cdb954bae.zip
Tweak release scripts
-rw-r--r--.github/workflows/bun-release.yml3
-rw-r--r--packages/bun-npm/scripts/npm-build.ts5
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/bun-release.yml b/.github/workflows/bun-release.yml
index 5699226f7..51dc9f2df 100644
--- a/.github/workflows/bun-release.yml
+++ b/.github/workflows/bun-release.yml
@@ -73,6 +73,7 @@ jobs:
uses: docker/metadata-action@v4
with:
images: ${{ secrets.DOCKERHUB_USERNAME }}/bun
+ flavor: latest=${{ env.TAG != "canary" }}
tags: |
type=match,pattern=(bun-v)?(canary|\d.\d.\d),group=2,value=${{ env.TAG }}
type=match,pattern=(bun-v)?(canary|\d.\d.\d),group=2,value=${{ env.TAG }}
@@ -87,7 +88,7 @@ jobs:
name: Push to Docker
uses: docker/build-push-action@v3
with:
- context: ./dockerhub
+ context: dockerhub
file: Dockerfile-debian
platforms: linux/amd64,linux/arm64
builder: ${{ steps.buildx.outputs.name }}
diff --git a/packages/bun-npm/scripts/npm-build.ts b/packages/bun-npm/scripts/npm-build.ts
index 83457903c..9f3547565 100644
--- a/packages/bun-npm/scripts/npm-build.ts
+++ b/packages/bun-npm/scripts/npm-build.ts
@@ -196,9 +196,8 @@ async function getCanaryVersion(): Promise<string> {
const { canary }: { canary: string } = await response.json();
if (canary.startsWith(semver)) {
const match = /canary.[0-9]{8}\.([0-9]+)+?/.exec(canary);
- if (match && isFinite(parseInt(match[1]))) {
- return `${semver}.${match[1]}+${sha}`;
- }
+ const build = 1 + (match ? parseInt(match[1]) : 0);
+ return `${semver}.${build}+${sha}`;
}
return `${semver}.1+${sha}`;
} catch (error) {