From 2e0091ce3002d86eefa449ba5802e8e2f6e0313f Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 21 Nov 2024 09:23:53 +0900 Subject: [PATCH 1/3] Revert "Generate debug information" This reverts commit 312b2f1e9582fca01e023d384072077553a1f4cb. CFLAGS `-g` seems to break reproducible builds (`make test.repro`) on macos-13 and later. Signed-off-by: Akihiro Suda --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 401fb80..14b9bce 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ GZIP ?= gzip -9 -n DIFFOSCOPE ?= diffoscope STRIP ?= strip -CFLAGS ?= -O3 -g +CFLAGS ?= -O3 VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags) VERSION_TRIMMED := $(VERSION:v%=%) From 6b9365135b1202b06d5e91f87b10873c3232008b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 21 Nov 2024 08:54:01 +0900 Subject: [PATCH 2/3] CI: remove macos-12; add macos-14-large The macos-12 CI will be completely removed by Dec 3, 2024. (actions/runner-images issue 10721) macos-15-large is not used yet as the CI fails with "No route to host" (PR 63) Signed-off-by: Akihiro Suda --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbacec1..21e6c5e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ permissions: contents: read jobs: release: - runs-on: macos-12 + runs-on: macos-15 # The maximum access is "read" for PRs from public forked repos # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token permissions: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 189e92b..6a2b8fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,11 +14,14 @@ jobs: integration: name: Integration tests strategy: + fail-fast: false matrix: # macos-13-large is used as macos-13 seems too flaky. - # macos-14 (ARM) cannot be used for the most part of the job + # macos-14 (ARM) and later cannot be used for the most part of the job # due to the lack of the support for nested virt. - platform: [macos-12, macos-13-large] + # + # TODO: add macos-15-large https://github.com/lima-vm/socket_vmnet/pull/63 + platform: [macos-13-large, macos-14-large] runs-on: ${{ matrix.platform }} timeout-minutes: 40 steps: From 49fcbc50a249ce98848083d3a820b26f8b9a2c51 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 21 Nov 2024 09:38:21 +0900 Subject: [PATCH 3/3] Makefile: support specifying DEBUG=1 Signed-off-by: Akihiro Suda --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 14b9bce..1093ed3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ # PREFIX should be only writable by the root to avoid privilege escalation with launchd or sudo PREFIX ?= /opt/socket_vmnet +# DEBUG=1 is known to break reproducible builds +DEBUG ?= + export SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct) # https://reproducible-builds.org/docs/archives/ TAR ?= gtar --sort=name --mtime="@$(SOURCE_DATE_EPOCH)" --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime @@ -11,6 +14,9 @@ DIFFOSCOPE ?= diffoscope STRIP ?= strip CFLAGS ?= -O3 +ifeq ($(DEBUG),1) + CFLAGS += -g +endif VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags) VERSION_TRIMMED := $(VERSION:v%=%)