Test fix

oven-sh · Oct 29, 2024 · 2d350a6 · 2d350a6
1 parent 3422b4d
commit 2d350a6
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 73 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -21,60 +21,60 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - arch: "aarch64"
-            distro: "debian"
-            release: "12"
-          - arch: "aarch64"
-            distro: "debian"
-            release: "11"
-          - arch: "aarch64"
-            distro: "debian"
-            release: "10"
-          - arch: "aarch64"
-            distro: "ubuntu"
-            release: "2404"
-          - arch: "aarch64"
-            distro: "ubuntu"
-            release: "2204"
-          - arch: "aarch64"
-            distro: "ubuntu"
-            release: "2004"
-          - arch: "aarch64"
-            distro: "ubuntu"
-            release: "1804"
-          - arch: "aarch64"
-            distro: "amazonlinux"
-            release: "2023"
-          - arch: "aarch64"
-            distro: "amazonlinux"
-            release: "2"
-          - arch: "x64"
-            distro: "debian"
-            release: "12"
+          # - arch: "aarch64"
+          #   distro: "debian"
+          #   release: "12"
+          # - arch: "aarch64"
+          #   distro: "debian"
+          #   release: "11"
+          # - arch: "aarch64"
+          #   distro: "debian"
+          #   release: "10"
+          # - arch: "aarch64"
+          #   distro: "ubuntu"
+          #   release: "2404"
+          # - arch: "aarch64"
+          #   distro: "ubuntu"
+          #   release: "2204"
+          # - arch: "aarch64"
+          #   distro: "ubuntu"
+          #   release: "2004"
+          # - arch: "aarch64"
+          #   distro: "ubuntu"
+          #   release: "1804"
+          # - arch: "aarch64"
+          #   distro: "amazonlinux"
+          #   release: "2023"
+          # - arch: "aarch64"
+          #   distro: "amazonlinux"
+          #   release: "2"
+          # - arch: "x64"
+          #   distro: "debian"
+          #   release: "12"
           - arch: "x64"
             distro: "debian"
             release: "11"
-          - arch: "x64"
-            distro: "debian"
-            release: "10"
-          - arch: "x64"
-            distro: "ubuntu"
-            release: "2404"
-          - arch: "x64"
-            distro: "ubuntu"
-            release: "2204"
-          - arch: "x64"
-            distro: "ubuntu"
-            release: "2004"
-          - arch: "x64"
-            distro: "ubuntu"
-            release: "1804"
-          - arch: "x64"
-            distro: "amazonlinux"
-            release: "2023"
-          - arch: "x64"
-            distro: "amazonlinux"
-            release: "2"
+          # - arch: "x64"
+          #   distro: "debian"
+          #   release: "10"
+          # - arch: "x64"
+          #   distro: "ubuntu"
+          #   release: "2404"
+          # - arch: "x64"
+          #   distro: "ubuntu"
+          #   release: "2204"
+          # - arch: "x64"
+          #   distro: "ubuntu"
+          #   release: "2004"
+          # - arch: "x64"
+          #   distro: "ubuntu"
+          #   release: "1804"
+          # - arch: "x64"
+          #   distro: "amazonlinux"
+          #   release: "2023"
+          # - arch: "x64"
+          #   distro: "amazonlinux"
+          #   release: "2"
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/ci/package.json b/ci/package.json
@@ -33,24 +33,24 @@
     "build:darwin-aarch64-15": "packer build '-only=*.bun-darwin-aarch64' -var release=15 darwin/",
     "build:darwin-aarch64-14": "packer build '-only=*.bun-darwin-aarch64' -var release=14 darwin/",
     "build:darwin-aarch64-13": "packer build '-only=*.bun-darwin-aarch64' -var release=13 darwin/",
-    "test:linux-aarch64-debian-12": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-debian-12-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-aarch64-debian-11": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-debian-11-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun run build:ci && node scripts/runner.node.mjs --exec-path ./build/release-ci/bun'",
-    "test:linux-aarch64-debian-10": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-debian-10-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-aarch64-ubuntu-2404": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-2404-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-aarch64-ubuntu-2204": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-2204-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-aarch64-ubuntu-2004": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-2004-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-aarch64-ubuntu-1804": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-1804-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-aarch64-amazonlinux-2023": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-amazonlinux-2023-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-aarch64-amazonlinux-2": "docker run --rm -t \"$(bun fetch:image-name):linux-aarch64-amazonlinux-2-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-debian-12": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-debian-12-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-debian-11": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-debian-11-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun run build:ci && node scripts/runner.node.mjs --exec-path ./build/release-ci/bun'",
-    "test:linux-x64-debian-10": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-debian-10-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-ubuntu-2404": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-ubuntu-2404-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-ubuntu-2204": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-ubuntu-2204-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-ubuntu-2004": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-ubuntu-2004-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-ubuntu-1804": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-ubuntu-1804-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-amazonlinux-2023": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-amazonlinux-2023-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
-    "test:linux-x64-amazonlinux-2": "docker run --rm -t \"$(bun fetch:image-name):linux-x64-amazonlinux-2-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-debian-12": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-debian-12-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-debian-11": "docker run --rm -e CI=$CI -e GITHUB_ACTION=$GITHUB_ACTION -e GITHUB_OUTPUT=/github/output -v ${GITHUB_OUTPUT:-/dev/null}:/github/output -e GITHUB_STEP_SUMMARY=/github/step-summary -v ${GITHUB_STEP_SUMMARY:-/dev/null}:/github/step-summary -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-debian-11-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun run build:ci && node scripts/runner.node.mjs --exec-path ./build/release-ci/bun'",
+    "test:linux-aarch64-debian-10": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-debian-10-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-ubuntu-2404": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-2404-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-ubuntu-2204": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-2204-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-ubuntu-2004": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-2004-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-ubuntu-1804": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-ubuntu-1804-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-amazonlinux-2023": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-amazonlinux-2023-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-aarch64-amazonlinux-2": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-aarch64-amazonlinux-2-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && bun --revision && bun upgrade --canary || ls /tmp/ && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-debian-12": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-debian-12-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-debian-11": "docker run --rm -e CI=$CI -e GITHUB_ACTION=$GITHUB_ACTION -e GITHUB_OUTPUT=/github/output -v ${GITHUB_OUTPUT:-/dev/null}:/github/output -e GITHUB_STEP_SUMMARY=/github/step-summary -v ${GITHUB_STEP_SUMMARY:-/dev/null}:/github/step-summary -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-debian-11-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun run build:ci && node scripts/runner.node.mjs --exec-path ./build/release-ci/bun'",
+    "test:linux-x64-debian-10": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-debian-10-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-ubuntu-2404": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-ubuntu-2404-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-ubuntu-2204": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-ubuntu-2204-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-ubuntu-2004": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-ubuntu-2004-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-ubuntu-1804": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-ubuntu-1804-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-amazonlinux-2023": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-amazonlinux-2023-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
+    "test:linux-x64-amazonlinux-2": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -t \"$(bun fetch:image-name):linux-x64-amazonlinux-2-v$(bun fetch:script-version)\" /bin/sh -c 'mkdir /workspace && cd /workspace && git clone https://github.com/oven-sh/bun bun && cd bun && bun upgrade --canary && node scripts/runner.node.mjs'",
     "publish:linux-aarch64-debian-12": "docker push \"$(bun fetch:image-name):linux-aarch64-debian-12-v$(bun fetch:script-version)\"",
     "publish:linux-aarch64-debian-11": "docker push \"$(bun fetch:image-name):linux-aarch64-debian-11-v$(bun fetch:script-version)\"",
     "publish:linux-aarch64-debian-10": "docker push \"$(bun fetch:image-name):linux-aarch64-debian-10-v$(bun fetch:script-version)\"",

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -606,10 +606,6 @@ install_rust() {
 }
 
 install_docker() {
-  if [ "$docker" = "1" ]; then
-    return
-  fi
-
   case "$pm" in
   brew)
     if ! [ -d "/Applications/Docker.app" ]; then