Skip to content

Commit c3f1b45

Browse files
authored
Merge pull request #80 from AkihiroSuda/dev2
CI: remove macos-12; add macos-14-large
2 parents 8664a96 + 49fcbc5 commit c3f1b45

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
contents: read
1717
jobs:
1818
release:
19-
runs-on: macos-12
19+
runs-on: macos-15
2020
# The maximum access is "read" for PRs from public forked repos
2121
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token
2222
permissions:

.github/workflows/test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@ jobs:
1414
integration:
1515
name: Integration tests
1616
strategy:
17+
fail-fast: false
1718
matrix:
1819
# macos-13-large is used as macos-13 seems too flaky.
19-
# macos-14 (ARM) cannot be used for the most part of the job
20+
# macos-14 (ARM) and later cannot be used for the most part of the job
2021
# due to the lack of the support for nested virt.
21-
platform: [macos-12, macos-13-large]
22+
#
23+
# TODO: add macos-15-large https://github.com/lima-vm/socket_vmnet/pull/63
24+
platform: [macos-13-large, macos-14-large]
2225
runs-on: ${{ matrix.platform }}
2326
timeout-minutes: 40
2427
steps:

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# PREFIX should be only writable by the root to avoid privilege escalation with launchd or sudo
22
PREFIX ?= /opt/socket_vmnet
33

4+
# DEBUG=1 is known to break reproducible builds
5+
DEBUG ?=
6+
47
export SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct)
58
# https://reproducible-builds.org/docs/archives/
69
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
@@ -10,7 +13,10 @@ GZIP ?= gzip -9 -n
1013
DIFFOSCOPE ?= diffoscope
1114
STRIP ?= strip
1215

13-
CFLAGS ?= -O3 -g
16+
CFLAGS ?= -O3
17+
ifeq ($(DEBUG),1)
18+
CFLAGS += -g
19+
endif
1420

1521
VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags)
1622
VERSION_TRIMMED := $(VERSION:v%=%)

0 commit comments

Comments
 (0)