diff options
author | Florian Bruhin <me@the-compiler.org> | 2020-10-05 20:27:22 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2020-10-05 20:27:22 +0200 |
commit | d6c7e3e6a8d4cf03831404159f34ffa850138dc8 (patch) | |
tree | c97b3be64dfc963d568ce22cebede10a992e895c | |
parent | 4f939952948e3ffb7d65df6103351a53c6c6cb68 (diff) | |
parent | 76eae19706ee319095be1a85aede0921d531c01d (diff) | |
download | qutebrowser-d6c7e3e6a8d4cf03831404159f34ffa850138dc8.tar.gz qutebrowser-d6c7e3e6a8d4cf03831404159f34ffa850138dc8.zip |
Merge remote-tracking branch 'origin/pr/5756' into master
-rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
-rw-r--r-- | .github/workflows/recompile-requirements.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20d13c534..ec8d5aa92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: .tox ~/.cache/pip key: "${{ matrix.testenv }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}" - - uses: actions/setup-python@v2.1.2 + - uses: actions/setup-python@v2.1.3 with: python-version: '3.8' - uses: actions/setup-node@v2.1.2 @@ -157,7 +157,7 @@ jobs: ~/.cache/pip key: "${{ matrix.testenv }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}" - name: Set up Python - uses: actions/setup-python@v2.1.2 + uses: actions/setup-python@v2.1.3 with: python-version: "${{ matrix.python }}" - name: Set up problem matchers diff --git a/.github/workflows/recompile-requirements.yml b/.github/workflows/recompile-requirements.yml index 565ebcf47..750371c87 100644 --- a/.github/workflows/recompile-requirements.yml +++ b/.github/workflows/recompile-requirements.yml @@ -20,11 +20,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python 3.7 - uses: actions/setup-python@v2.1.2 + uses: actions/setup-python@v2.1.3 with: python-version: '3.7' - name: Set up Python 3.8 - uses: actions/setup-python@v2.1.2 + uses: actions/setup-python@v2.1.3 with: python-version: '3.8' - name: Recompile requirements |