Skip to content

Commit 77f0bfd

Browse files
committed
ci: restore setup-deps from upstream
1 parent 0ff67b4 commit 77f0bfd

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

.github/actions/setup-deps/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ runs:
7171
python3.12-dev # for github.com/goplus/lib/py
7272
)
7373
sudo apt-get install -y "${opt_deps[@]}"
74+

.github/workflows/llgo.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ jobs:
4343
- macos-latest
4444
- ubuntu-latest
4545
llvm: [19]
46-
<<<<<<< HEAD
4746
go: ["1.21.13", "1.24.2"]
48-
=======
49-
go: ["1.21.13", "1.22.12", "1.23.6", "1.24.2"]
50-
>>>>>>> da88fccb (ci: restore workflow files from main branch)
5147
runs-on: ${{matrix.os}}
5248
steps:
5349
- uses: actions/checkout@v6
@@ -215,19 +211,14 @@ jobs:
215211
run: |
216212
llgo test ./...
217213
218-
219214
hello:
220215
continue-on-error: true
221216
timeout-minutes: 30
222217
strategy:
223218
matrix:
224219
os: [ubuntu-latest, macos-latest]
225220
llvm: [19]
226-
<<<<<<< HEAD
227221
go: ["1.21.13", "1.24.2"]
228-
=======
229-
go: ["1.21.13", "1.22.12", "1.23.6", "1.24.2"]
230-
>>>>>>> da88fccb (ci: restore workflow files from main branch)
231222
runs-on: ${{matrix.os}}
232223
steps:
233224
- uses: actions/checkout@v6

0 commit comments

Comments
 (0)