This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-go.git
The following commit(s) were added to refs/heads/main by this push:
new 400e658 fix: CI test build on macos failed (#97)
400e658 is described below
commit 400e658f7cf0bdc9d1763b0e29a83c7a52daf963
Author: Klein <[email protected]>
AuthorDate: Tue Aug 22 22:24:06 2023 +0800
fix: CI test build on macos failed (#97)
---
.github/workflows/plugin-tests.yaml | 18 ++++++++++++------
.github/workflows/skywalking-go.yaml | 4 ++--
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/plugin-tests.yaml
b/.github/workflows/plugin-tests.yaml
index 81725e4..aaeca59 100644
--- a/.github/workflows/plugin-tests.yaml
+++ b/.github/workflows/plugin-tests.yaml
@@ -29,8 +29,8 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ubuntu, macos]
- runs-on: ${{ matrix.os }}-latest
+ os: [ubuntu-latest, macos-13]
+ runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- name: Set up Go 1.18
@@ -41,6 +41,7 @@ jobs:
if: runner.os == 'macos'
run: |
brew install docker
+ brew install colima
colima start
# For testcontainers to find the Colima socket
@@ -91,7 +92,7 @@ jobs:
submodules: true
- uses: actions/download-artifact@v2
with:
- name: test-tools-ubuntu
+ name: test-tools-ubuntu-latest
path: test/plugins/dist
- name: Setup Tools
run: |
@@ -113,7 +114,7 @@ jobs:
name: gin-macos
needs:
- build
- runs-on: macos-latest
+ runs-on: macos-13
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
@@ -121,12 +122,17 @@ jobs:
submodules: true
- uses: actions/download-artifact@v2
with:
- name: test-tools-macos
+ name: test-tools-macos-13
path: test/plugins/dist
+ - name: Set up Go 1.18
+ uses: actions/setup-go@v2
+ with:
+ go-version: 1.18
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
run: |
brew install docker docker-compose
+ brew install colima
colima start
# For testcontainers to find the Colima socket
@@ -160,4 +166,4 @@ jobs:
run: |
if [[ ${{ needs.test.result }} != 'success' || ${{
needs.test-on-macos.result }} != 'success' ]]; then
exit -1
- fi
+ fi
\ No newline at end of file
diff --git a/.github/workflows/skywalking-go.yaml
b/.github/workflows/skywalking-go.yaml
index fd82578..3987837 100644
--- a/.github/workflows/skywalking-go.yaml
+++ b/.github/workflows/skywalking-go.yaml
@@ -47,9 +47,9 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ ubuntu, macos, windows ]
+ os: [ ubuntu-latest, macos-13, windows-latest ]
go-version: [ 1.18, 1.19 ]
- runs-on: ${{ matrix.os }}-latest
+ runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- name: Set up Go ${{ matrix.go-version }}
