diff options
| author | toofar <toofar@spalge.com> | 2022-11-20 15:48:00 +1300 |
|---|---|---|
| committer | toofar <toofar@spalge.com> | 2022-11-20 15:48:00 +1300 |
| commit | 2d6646619449d0baa72b35c9e88a3cc8f7c0b790 (patch) | |
| tree | 1501ae07ce9917d257ce900e17a921f369c3ae88 /.github | |
| parent | d9a46b1a62792b3f74e428bbde852209328f1e8d (diff) | |
| parent | 1417ffa519a7c43197edafde76dd49fc348784f7 (diff) | |
| download | qutebrowser-2d6646619449d0baa72b35c9e88a3cc8f7c0b790.tar.gz qutebrowser-2d6646619449d0baa72b35c9e88a3cc8f7c0b790.zip | |
Merge branch 'master' into qt6-v2
Just a few conflicts around CI and dependencies.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/dependabot.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/nightly.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/recompile-requirements.yml | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..5ace4600a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 073f2c69c..5aaafb666 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -97,8 +97,8 @@ jobs: - name: Gather info id: info run: | - echo "::set-output name=date::$(date +'%Y-%m-%d')" - echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT" + echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT" - name: Upload artifacts uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/recompile-requirements.yml b/.github/workflows/recompile-requirements.yml index 3c7442a61..c7d9702a7 100644 --- a/.github/workflows/recompile-requirements.yml +++ b/.github/workflows/recompile-requirements.yml @@ -45,7 +45,7 @@ jobs: - name: Run qutebrowser smoke test run: "xvfb-run .venv/bin/python3 -m qutebrowser --no-err-windows --nowindow --temp-basedir about:blank ':later 500 quit'" - name: Create pull request - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: committer: qutebrowser bot <bot@qutebrowser.org> author: qutebrowser bot <bot@qutebrowser.org> |