From e779fa96b0787d5d89e93c47985cfc13ae276aed Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Sun, 29 Dec 2024 15:52:19 -0800 Subject: [PATCH 1/6] Introduce macOS dev compatibility --- .github/workflows/test.yml | 2 +- scripts/generate-perfetto-trace-proto.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index feafe88..dadbad3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: python-version: ['3.10', '3.11', '3.12'] - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] fail-fast: false # Continue running jobs even if one fails steps: diff --git a/scripts/generate-perfetto-trace-proto.sh b/scripts/generate-perfetto-trace-proto.sh index 99d73bf..efe90a8 100755 --- a/scripts/generate-perfetto-trace-proto.sh +++ b/scripts/generate-perfetto-trace-proto.sh @@ -6,7 +6,7 @@ mkdir -p tmp mkdir -p vendor/generated check_proto() { - echo "cf1ec0ad32d6772a2bf852e17195e1616062c2afa2320a2eb3f8af7f7956d7e3 tmp/perfetto_trace.proto" | sha256sum --check $@ + echo "cf1ec0ad32d6772a2bf852e17195e1616062c2afa2320a2eb3f8af7f7956d7e3 tmp/perfetto_trace.proto" | shasum -a 256 --check $@ } # Generate python bindings from perfetto_trace.proto From 590cc1151c2a275c9ffa1c094065500a304d0b29 Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Sun, 29 Dec 2024 16:00:20 -0800 Subject: [PATCH 2/6] Install colima --- .github/workflows/test.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dadbad3..75f057f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,14 +18,20 @@ jobs: fail-fast: false # Continue running jobs even if one fails steps: - - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.17 + - name: Set up Docker (macOS) + if: ${{ startsWith(matrix.os, 'macos') }} + run: | + brew install colima + colima start - name: Set up PDM uses: pdm-project/setup-pdm@568ddd69406b30de1774ec0044b73ae06e716aa4 # v4.1 with: python-version: ${{ matrix.python-version }} + - name: Checkout repository + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.17 + - name: Install dependencies run: | pdm sync --dev From f8373665c01712d19c20784af930bca114dcbfb8 Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Sun, 29 Dec 2024 16:01:22 -0800 Subject: [PATCH 3/6] Start colima with brew --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75f057f..05a5fe2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: if: ${{ startsWith(matrix.os, 'macos') }} run: | brew install colima - colima start + brew services start colima - name: Set up PDM uses: pdm-project/setup-pdm@568ddd69406b30de1774ec0044b73ae06e716aa4 # v4.1 From 8603bd13cbe2756f3d15f76a9d6504890824a431 Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Sun, 29 Dec 2024 16:02:39 -0800 Subject: [PATCH 4/6] Install docker as well --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05a5fe2..e9afc41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Docker (macOS) if: ${{ startsWith(matrix.os, 'macos') }} run: | - brew install colima + brew install colima docker brew services start colima - name: Set up PDM From 03b14f4dd4056fe801a00702c5fad3f46fe6766d Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Sun, 29 Dec 2024 16:03:47 -0800 Subject: [PATCH 5/6] Use colima start --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9afc41..56523fa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: if: ${{ startsWith(matrix.os, 'macos') }} run: | brew install colima docker - brew services start colima + colima start - name: Set up PDM uses: pdm-project/setup-pdm@568ddd69406b30de1774ec0044b73ae06e716aa4 # v4.1 From 6574fb66ce621cff8214c60bdc7df74f2c601ace Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Sun, 29 Dec 2024 16:09:52 -0800 Subject: [PATCH 6/6] Use macos-13 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 56523fa..bca03ce 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: python-version: ['3.10', '3.11', '3.12'] - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] fail-fast: false # Continue running jobs even if one fails steps: