diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index bf29a12a..344b3cb2 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -36,6 +36,7 @@ runs: # Zig version used from the `minimum_zig_version` field in build.zig.zon - uses: mlugg/setup-zig@v2 + # Rust Toolchain for html5ever - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 609a9b8b..3ef3a04f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 # fetch submodules recusively, to get zig-js-runtime submodules also. diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index b88da652..c9e0271a 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -49,7 +49,7 @@ jobs: if: github.event.pull_request.draft == false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 # fetch submodules recusively, to get zig-js-runtime submodules also. diff --git a/.github/workflows/wpt.yml b/.github/workflows/wpt.yml index 205c63ae..489bd8dd 100644 --- a/.github/workflows/wpt.yml +++ b/.github/workflows/wpt.yml @@ -22,7 +22,7 @@ jobs: timeout-minutes: 90 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 # fetch submodules recusively, to get zig-js-runtime submodules also. diff --git a/.github/workflows/zig-fmt.yml b/.github/workflows/zig-fmt.yml index 106e557a..a6df7e1f 100644 --- a/.github/workflows/zig-fmt.yml +++ b/.github/workflows/zig-fmt.yml @@ -1,8 +1,5 @@ name: zig-fmt -env: - ZIG_VERSION: 0.15.2 - on: pull_request: @@ -32,14 +29,13 @@ jobs: timeout-minutes: 15 steps: - - uses: mlugg/setup-zig@v2 - with: - version: ${{ env.ZIG_VERSION }} - - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 + # Zig version used from the `minimum_zig_version` field in build.zig.zon + - uses: mlugg/setup-zig@v2 + - name: Run zig fmt id: fmt run: | @@ -58,6 +54,7 @@ jobs: fi echo "${delimiter}" >> "${GITHUB_OUTPUT}" + - name: Fail the job if: steps.fmt.outputs.zig_fmt_errs != '' run: exit 1 diff --git a/.github/workflows/zig-test.yml b/.github/workflows/zig-test.yml index db54a893..f30a68e3 100644 --- a/.github/workflows/zig-test.yml +++ b/.github/workflows/zig-test.yml @@ -47,10 +47,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - # fetch submodules recusively, to get zig-js-runtime submodules also. submodules: recursive - uses: ./.github/actions/install diff --git a/Makefile b/Makefile index 8f391d20..7404367f 100644 --- a/Makefile +++ b/Makefile @@ -47,18 +47,7 @@ help: # $(ZIG) commands # ------------ -.PHONY: build build-dev run run-release shell test bench download-zig wpt data -.PHONY: end2end - -zig_version = $(shell grep 'recommended_zig_version = "' "vendor/zig-js-runtime/build.zig" | cut -d'"' -f2) - -## Download the zig recommended version -download-zig: - $(eval url = "https://ziglang.org/download/$(zig_version)/zig-$(OS)-$(ARCH)-$(zig_version).tar.xz") - $(eval dest = "/tmp/zig-$(OS)-$(ARCH)-$(zig_version).tar.xz") - @printf "\033[36mDownload zig version $(zig_version)...\033[0m\n" - @curl -o "$(dest)" -L "$(url)" || (printf "\033[33mBuild ERROR\033[0m\n"; exit 1;) - @printf "\033[33mDownloaded $(dest)\033[0m\n" +.PHONY: build build-dev run run-release shell test bench wpt data end2end ## Build in release-safe mode build: diff --git a/build.zig.zon b/build.zig.zon index e2069f79..9f6a65c5 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -2,7 +2,7 @@ .name = .browser, .paths = .{""}, .version = "0.0.0", - .fingerprint = 0xda130f3af836cea0, + .fingerprint = 0xda130f3af836cea0, // Changing this has security and trust implications. .minimum_zig_version = "0.15.2", .dependencies = .{ .v8 = .{