summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-03-30 14:10:50 +0100
committerDavid Robertson <davidr@element.io>2022-03-30 18:27:35 +0100
commit680dbc86b13f59b184243183f5f76344ecc49c65 (patch)
tree48c8de7b216337a48f62f4e9100f8fcf2dd0c2b5
parentDOCS: recommend poetry where appropriate (diff)
downloadsynapse-680dbc86b13f59b184243183f5f76344ecc49c65.tar.xz
Undebug various changes
- Stop always running twisted trunk on this branch
- Stop building all devs on this branch
- Run olddeps after linting
-rw-r--r--.github/workflows/release-artifacts.yml6
-rw-r--r--.github/workflows/tests.yml2
-rw-r--r--.github/workflows/twisted_trunk.yml37
3 files changed, 22 insertions, 23 deletions
diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
index 6978a59dd9..ed4fc6179d 100644
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -29,10 +29,10 @@ jobs:
       - id: set-distros
         run: |
           # 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='["debian:sid"]'
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
               dists=$(scripts-dev/build_debian_packages.py --show-dists-json)
-          # fi
+          fi
           echo "::set-output name=distros::$dists"
     # map the step outputs to job outputs
     outputs:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dd968878d0..3f7e070c5c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -121,7 +121,7 @@ jobs:
   trial-olddeps:
     # Note: sqlite only; no postgres
     if: ${{ !cancelled() && !failure() }} # Allow previous steps to be skipped, but not fail
-#    needs: linting-done
+    needs: linting-done
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml
index c58d300137..dbd43ff693 100644
--- a/.github/workflows/twisted_trunk.yml
+++ b/.github/workflows/twisted_trunk.yml
@@ -5,7 +5,6 @@ on:
     - cron: 0 8 * * *
 
   workflow_dispatch:
-  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -84,21 +83,21 @@ jobs:
             /logs/results.tap
             /logs/**/*.log*
 
-#  # open an issue if the build fails, so we know about it.
-#  open-issue:
-#    if: failure()
-#    needs:
-#      - mypy
-#      - trial
-#      - sytest
-#
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#      - uses: actions/checkout@v2
-#      - uses: JasonEtco/create-an-issue@5d9504915f79f9cc6d791934b8ef34f2353dd74d # v2.5.0, 2020-12-06
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          update_existing: true
-#          filename: .ci/twisted_trunk_build_failed_issue_template.md
+  # open an issue if the build fails, so we know about it.
+  open-issue:
+    if: failure()
+    needs:
+      - mypy
+      - trial
+      - sytest
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: JasonEtco/create-an-issue@5d9504915f79f9cc6d791934b8ef34f2353dd74d # v2.5.0, 2020-12-06
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          update_existing: true
+          filename: .ci/twisted_trunk_build_failed_issue_template.md