fix yml conflict

This commit is contained in:
luoliwoshang
2025-09-08 14:32:24 +08:00
6 changed files with 43 additions and 5 deletions

View File

@@ -6,14 +6,19 @@ on:
pull_request: pull_request:
branches: ["**"] branches: ["**"]
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
doc_verify: doc_verify:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 30
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
- name: Set up Node.js - name: Set up Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v5
with: with:
node-version: "20" node-version: "20"
@@ -31,6 +36,7 @@ jobs:
remote_install: remote_install:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: os:
@@ -67,6 +73,7 @@ jobs:
local_install: local_install:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: os:
@@ -77,7 +84,7 @@ jobs:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v6
with: with:
go-version: "1.23" go-version: "1.23"
@@ -118,6 +125,7 @@ jobs:
local_install_full: local_install_full:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: os:
@@ -128,7 +136,7 @@ jobs:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v6
with: with:
go-version: "1.23" go-version: "1.23"

View File

@@ -6,9 +6,14 @@ on:
pull_request: pull_request:
branches: ["**"] branches: ["**"]
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
fmt: fmt:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 30
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5

View File

@@ -9,9 +9,14 @@ on:
pull_request: pull_request:
branches: ["**"] branches: ["**"]
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
test: test:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: os:

View File

@@ -9,9 +9,14 @@ on:
pull_request: pull_request:
branches: ["**"] branches: ["**"]
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
download-model: download-model:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 30
steps: steps:
- name: Download model file - name: Download model file
run: | run: |
@@ -28,6 +33,7 @@ jobs:
llgo: llgo:
needs: download-model needs: download-model
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: os:
@@ -87,7 +93,7 @@ jobs:
echo "LLGO_ROOT=$GITHUB_WORKSPACE" >> $GITHUB_ENV echo "LLGO_ROOT=$GITHUB_WORKSPACE" >> $GITHUB_ENV
- name: Set up Go for testing - name: Set up Go for testing
uses: actions/setup-go@v5 uses: actions/setup-go@v6
with: with:
go-version: ${{matrix.go}} go-version: ${{matrix.go}}
@@ -133,6 +139,7 @@ jobs:
test: test:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: os:
@@ -166,7 +173,7 @@ jobs:
echo "LLGO_ROOT=$GITHUB_WORKSPACE" >> $GITHUB_ENV echo "LLGO_ROOT=$GITHUB_WORKSPACE" >> $GITHUB_ENV
- name: Set up Go for testing - name: Set up Go for testing
uses: actions/setup-go@v5 uses: actions/setup-go@v6
with: with:
go-version: ${{matrix.go}} go-version: ${{matrix.go}}
@@ -176,6 +183,7 @@ jobs:
hello: hello:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: [ubuntu-24.04, macos-latest] os: [ubuntu-24.04, macos-latest]
@@ -234,6 +242,7 @@ jobs:
cross-compile: cross-compile:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: [macos-latest] os: [macos-latest]

View File

@@ -7,6 +7,10 @@ on:
pull_request: pull_request:
branches: ["**"] branches: ["**"]
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
setup: setup:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -26,6 +30,7 @@ jobs:
populate-darwin-sysroot: populate-darwin-sysroot:
runs-on: macos-latest runs-on: macos-latest
timeout-minutes: 30
needs: setup needs: setup
steps: steps:
- name: Check out code - name: Check out code
@@ -52,6 +57,7 @@ jobs:
populate-linux-sysroot: populate-linux-sysroot:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: setup needs: setup
timeout-minutes: 30
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@v5 uses: actions/checkout@v5

View File

@@ -7,9 +7,14 @@ on:
pull_request: pull_request:
branches: ["**"] branches: ["**"]
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
llgo: llgo:
continue-on-error: true continue-on-error: true
timeout-minutes: 30
strategy: strategy:
matrix: matrix:
os: os: