diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml index e54270e7..72a757ca 100644 --- a/.github/workflows/test-and-deploy.yaml +++ b/.github/workflows/test-and-deploy.yaml @@ -15,10 +15,14 @@ jobs: deploy: name: deploy on staging2.testrun.org, and run tests runs-on: ubuntu-latest + timeout-minutes: 30 concurrency: - group: staging-deploy - cancel-in-progress: true + group: ci-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ !contains(github.ref, '$GITHUB_REF') }} steps: + - uses: jsok/serialize-workflow-action@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/checkout@v4 - name: prepare SSH diff --git a/CHANGELOG.md b/CHANGELOG.md index 215c8b2a..be7b4dae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ which removes users from database and mails after 100 days without any login. ([#350](https://github.com/deltachat/chatmail/pull/350)) +- reload nginx in the acmetool cronjob + ([#360](https://github.com/deltachat/chatmail/pull/360)) + - remove checking of reverse-DNS PTR records. Chatmail-servers don't depend on it and even in the wider e-mail system it's not common anymore. If it's an issue, a chatmail operator can still care to properly set reverse DNS.