From 51528c86f46440fa1b551c3757b25dca804e9184 Mon Sep 17 00:00:00 2001 From: Akuli Date: Mon, 17 Feb 2025 19:10:56 +0200 Subject: [PATCH 1/5] Fix shebang --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 110e382a..e2eade50 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # The Jou compiler is written in Jou, but it doesn't help you very much if you # have nothing that can compile or run Jou code. That's why this script exists. From 71599b51e6505ff12a31b75609ea2de826255c8c Mon Sep 17 00:00:00 2001 From: Akuli Date: Mon, 17 Feb 2025 19:15:06 +0200 Subject: [PATCH 2/5] Fix -v --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index e2eade50..d4ba9ace 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -78,7 +78,7 @@ for i in ${!commits[@]}; do folder=$(folder_of_commit $i) rm -rf $folder - mkdir -vp $folder + mkdir -p $folder # This seems to be the best way to checkout a commit into a folder. git archive --format=tar $commit | (cd $folder && tar xf -) From f2473aa05ad91222b36f33aa79c79a1ca3289666 Mon Sep 17 00:00:00 2001 From: Akuli Date: Mon, 17 Feb 2025 19:15:13 +0200 Subject: [PATCH 3/5] Enable it again --- .github/workflows/netbsd.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/netbsd.yml b/.github/workflows/netbsd.yml index c27257b2..512a9445 100644 --- a/.github/workflows/netbsd.yml +++ b/.github/workflows/netbsd.yml @@ -10,12 +10,8 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - # TODO: disabled for now because freezes with no output for some reason. - # Started happening in #562, so it has something to do with self-hosted compiler. - # # TODO: don't use an action for this? could we instead install qemu from apt and call it? - - if: false - uses: cross-platform-actions/action@v0.26.0 + - uses: cross-platform-actions/action@v0.26.0 env: PKG_PATH: 'https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/10.0/All' with: From b0b6e82cd92bd6c708dd93d463e6fd455d8f2a85 Mon Sep 17 00:00:00 2001 From: Akuli Date: Mon, 17 Feb 2025 19:18:27 +0200 Subject: [PATCH 4/5] Install git --- .github/workflows/netbsd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/netbsd.yml b/.github/workflows/netbsd.yml index 512a9445..c1d4933a 100644 --- a/.github/workflows/netbsd.yml +++ b/.github/workflows/netbsd.yml @@ -19,7 +19,7 @@ jobs: version: '10.0' environment_variables: PKG_PATH run: | - sudo pkgin -y install clang libLLVM gmake diffutils && \ + sudo pkgin -y install clang libLLVM gmake diffutils git && \ gmake && \ ./runtests.sh --verbose --stage1 && \ ./runtests.sh --verbose --stage2 && \ From 50bce3a591f210d617ca32e63c96d08c0482daaa Mon Sep 17 00:00:00 2001 From: Akuli Date: Mon, 17 Feb 2025 19:21:56 +0200 Subject: [PATCH 5/5] Fetch the whole Git history --- .github/workflows/netbsd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/netbsd.yml b/.github/workflows/netbsd.yml index c1d4933a..bc0aa5d2 100644 --- a/.github/workflows/netbsd.yml +++ b/.github/workflows/netbsd.yml @@ -10,6 +10,8 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch the whole Git history # TODO: don't use an action for this? could we instead install qemu from apt and call it? - uses: cross-platform-actions/action@v0.26.0 env: