diff options
author | Florian Bruhin <me@the-compiler.org> | 2020-11-25 20:01:28 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2020-11-25 22:34:18 +0100 |
commit | 31cd414664ed8600a82c09aec75b13b28befeb5b (patch) | |
tree | 86c5c0d3984d19c58861b3468f6a84fa143ea47e | |
parent | a686b75922b6c2f1568070dfe576646d6d3c2e76 (diff) | |
download | qutebrowser-31cd414664ed8600a82c09aec75b13b28befeb5b.tar.gz qutebrowser-31cd414664ed8600a82c09aec75b13b28befeb5b.zip |
ci: Fix lint for docker workflow
-rw-r--r-- | .github/workflows/docker.yml | 41 | ||||
-rw-r--r-- | scripts/dev/ci/docker/generate.py | 22 |
2 files changed, 44 insertions, 19 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a8b17528d..03510ad6e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,7 +7,7 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: image: @@ -36,23 +36,26 @@ jobs: push: ${{ github.ref == 'refs/heads/master' }} irc: - runs-on: ubuntu-latest + timeout-minutes: 2 + continue-on-error: true + runs-on: ubuntu-20.04 needs: [docker] - if: "always() && github.repository_owner == 'qutebrowser'" + if: "always() && github.repository == 'qutebrowser/qutebrowser'" steps: - - name: Send success IRC notification - uses: Gottox/irc-message-action@v1.1 - if: "needs.docker.result == 'success'" - with: - server: chat.freenode.net - channel: '#qutebrowser-dev' - nickname: qutebrowser-bot - message: "[${{ github.workflow }}] \u00033Success:\u0003 ${{ github.ref }} https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (@${{ github.actor }})" - - name: Send non-success IRC notification - uses: Gottox/irc-message-action@v1.1 - if: "needs.docker.result != 'success'" - with: - server: chat.freenode.net - channel: '#qutebrowser-dev' - nickname: qutebrowser-bot - message: "[${{ github.workflow }}] \u00034FAIL:\u0003 ${{ github.ref }} https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (@${{ github.actor }})" + - name: Send success IRC notification + uses: Gottox/irc-message-action@v1.1 + if: "needs.docker.result == 'success'" + with: + server: chat.freenode.net + channel: '#qutebrowser-dev' + nickname: qutebrowser-bot + message: "[${{ github.workflow }}] \u00033Success:\u0003 ${{ github.ref }} https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (@${{ github.actor }})" + - name: Send non-success IRC notification + uses: Gottox/irc-message-action@v1.1 + if: "needs.docker.result != 'success'" + with: + server: chat.freenode.net + channel: '#qutebrowser-dev' + nickname: qutebrowser-bot + message: "[${{ github.workflow }}] \u00034FAIL:\u0003 ${{ github.ref }} https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (@${{ github.actor }})\n + linters: ${{ needs.linters.result }}, tests: ${{ needs.tests.result }}, tests-docker: ${{ needs.tests-docker.result }}, codeql: ${{ needs.codeql.result }}" diff --git a/scripts/dev/ci/docker/generate.py b/scripts/dev/ci/docker/generate.py index a79633ed1..7d09fdb20 100644 --- a/scripts/dev/ci/docker/generate.py +++ b/scripts/dev/ci/docker/generate.py @@ -1,3 +1,25 @@ +#!/usr/bin/env python3 +# vim: ft=sh fileencoding=utf-8 sts=4 sw=4 et: + +# Copyright 2019-2020 Florian Bruhin (The Compiler) <mail@qutebrowser.org> + +# This file is part of qutebrowser. +# +# qutebrowser is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# qutebrowser is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>. + +"""Generate Dockerfiles for qutebrowser's CI.""" + import sys import jinja2 |