mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-16 10:33:11 -06:00
merge latest changes from dendrite main (#15)
Co-authored-by: Tak Wai Wong <tak@hntlabs.com>
This commit is contained in:
parent
b5d5f57a1c
commit
d5050c1d61
12
.github/workflows/dendrite.yml
vendored
12
.github/workflows/dendrite.yml
vendored
|
|
@ -102,7 +102,11 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
<<<<<<< HEAD
|
||||
go: ["1.18", "1.19"]
|
||||
=======
|
||||
go: ["1.18"]
|
||||
>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Setup go
|
||||
|
|
@ -132,7 +136,11 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
<<<<<<< HEAD
|
||||
go: ["1.18", "1.19"]
|
||||
=======
|
||||
go: ["1.18"]
|
||||
>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
|
||||
goos: ["linux"]
|
||||
goarch: ["amd64", "386"]
|
||||
steps:
|
||||
|
|
@ -166,7 +174,11 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
<<<<<<< HEAD
|
||||
go: ["1.18", "1.19"]
|
||||
=======
|
||||
go: ["1.18"]
|
||||
>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
|
||||
goos: ["windows"]
|
||||
goarch: ["amd64"]
|
||||
steps:
|
||||
|
|
|
|||
Loading…
Reference in a new issue