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

Merge upstream

Browse source 
Signed-off-by: Brian Meek <brian@hntlabs.com>
This commit is contained in:
Brian Meek 2023-02-07 17:31:43 -08:00
parent ceff2ae574
commit 9cc55befe7
No known key found for this signature in database
GPG key ID: ACBD71263BF42D00
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -273,11 +273,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
<<<<<<< HEAD
go-version: "1.19" go-version: "1.19"
=======
go-version: "1.18"
>>>>>>> eb29a315507f0075c2c6a495ac59c64a7f45f9fc
cache: true cache: true
- name: Build upgrade-tests - name: Build upgrade-tests
run: go build ./cmd/dendrite-upgrade-tests run: go build ./cmd/dendrite-upgrade-tests
@ -297,11 +293,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
<<<<<<< HEAD
go-version: "1.19" go-version: "1.19"
=======
go-version: "1.18"
>>>>>>> eb29a315507f0075c2c6a495ac59c64a7f45f9fc
cache: true cache: true
- name: Build upgrade-tests - name: Build upgrade-tests
run: go build ./cmd/dendrite-upgrade-tests run: go build ./cmd/dendrite-upgrade-tests
@ -481,7 +473,7 @@ jobs:
upgrade_test_direct, upgrade_test_direct,
sytest, sytest,
complement, complement,
integration integration,
] ]
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ !cancelled() }} # Run this even if prior jobs were skipped if: ${{ !cancelled() }} # Run this even if prior jobs were skipped