diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
index eee3633d50..ed4fc6179d 100644
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -31,7 +31,7 @@ jobs:
# if we're running from a tag, get the full list of distros; otherwise just use debian:sid
dists='["debian:sid"]'
if [[ $GITHUB_REF == refs/tags/* ]]; then
- dists=$(scripts-dev/build_debian_packages --show-dists-json)
+ dists=$(scripts-dev/build_debian_packages.py --show-dists-json)
fi
echo "::set-output name=distros::$dists"
# map the step outputs to job outputs
@@ -74,7 +74,7 @@ jobs:
# see https://github.com/docker/build-push-action/issues/252
# for the cache magic here
run: |
- ./src/scripts-dev/build_debian_packages \
+ ./src/scripts-dev/build_debian_packages.py \
--docker-build-arg=--cache-from=type=local,src=/tmp/.buildx-cache \
--docker-build-arg=--cache-to=type=local,mode=max,dest=/tmp/.buildx-cache-new \
--docker-build-arg=--progress=plain \
@@ -112,7 +112,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: |
- python-dist/*
+ Sdist/*
+ Wheel/*
debs.tar.xz
# if it's not already published, keep the release as a draft.
draft: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e9e4277322..2afddf58d1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,7 +16,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- run: pip install -e .
- - run: scripts-dev/generate_sample_config --check
+ - run: scripts-dev/generate_sample_config.sh --check
+ - run: scripts-dev/config-lint.sh
lint:
runs-on: ubuntu-latest
@@ -51,7 +52,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v2
- run: "pip install 'towncrier>=18.6.0rc1'"
- - run: scripts-dev/check-newsfragment
+ - run: scripts-dev/check-newsfragment.sh
env:
PULL_REQUEST_NUMBER: ${{ github.event.number }}
@@ -376,7 +377,7 @@ jobs:
# Run Complement
- run: |
set -o pipefail
- go test -v -json -p 1 -tags synapse_blacklist,msc2403 ./tests/... 2>&1 | gotestfmt
+ go test -v -json -tags synapse_blacklist,msc2403,msc2716,msc3030 ./tests/... 2>&1 | gotestfmt
shell: bash
name: Run Complement Tests
env:
@@ -387,34 +388,22 @@ jobs:
tests-done:
if: ${{ always() }}
needs:
+ - check-sampleconfig
- lint
- lint-crlf
- lint-newsfile
- trial
- trial-olddeps
- sytest
+ - export-data
- portdb
- complement
runs-on: ubuntu-latest
steps:
- - name: Set build result
- env:
- NEEDS_CONTEXT: ${{ toJSON(needs) }}
- # the `jq` incantation dumps out a series of "<job> <result>" lines.
- # we set it to an intermediate variable to avoid a pipe, which makes it
- # hard to set $rc.
- run: |
- rc=0
- results=$(jq -r 'to_entries[] | [.key,.value.result] | join(" ")' <<< $NEEDS_CONTEXT)
- while read job result ; do
- # The newsfile lint may be skipped on non PR builds
- if [ $result == "skipped" ] && [ $job == "lint-newsfile" ]; then
- continue
- fi
-
- if [ "$result" != "success" ]; then
- echo "::set-failed ::Job $job returned $result"
- rc=1
- fi
- done <<< $results
- exit $rc
+ - uses: matrix-org/done-action@v2
+ with:
+ needs: ${{ toJSON(needs) }}
+
+ # The newsfile lint may be skipped on non PR builds
+ skippable:
+ lint-newsfile
|
