mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge latest changes from dendrite main (#15)

Browse source 
Co-authored-by: Tak Wai Wong <tak@hntlabs.com>
This commit is contained in:
Tak Wai Wong 2022-07-14 17:00:19 -04:00
parent b5d5f57a1c
commit d5050c1d61
No known key found for this signature in database
GPG key ID: 222E4AF2AA1F467D
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/dendrite.yml vendored
View file

@ -102,7 +102,11 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
<<<<<<< HEAD
go: ["1.18", "1.19"] go: ["1.18", "1.19"]
=======
go: ["1.18"]
>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup go - name: Setup go
@ -132,7 +136,11 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
<<<<<<< HEAD
go: ["1.18", "1.19"] go: ["1.18", "1.19"]
=======
go: ["1.18"]
>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
goos: ["linux"] goos: ["linux"]
goarch: ["amd64", "386"] goarch: ["amd64", "386"]
steps: steps:
@ -166,7 +174,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
<<<<<<< HEAD
go: ["1.18", "1.19"] go: ["1.18", "1.19"]
=======
go: ["1.18"]
>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
goos: ["windows"] goos: ["windows"]
goarch: ["amd64"] goarch: ["amd64"]
steps: steps: