Skip to content

Commit 0a4af45

Browse files
authored
Merge branch 'develop' into optimize
2 parents 941c31b + 833eeba commit 0a4af45

File tree

3 files changed

+85
-11
lines changed

3 files changed

+85
-11
lines changed

.github/dependabot.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
# To get started with Dependabot version updates, you'll need to specify which
3+
# package ecosystems to update and where the package manifests are located.
4+
# Please see the documentation for all configuration options:
5+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
6+
7+
version: 2
8+
updates:
9+
# Maintain dependencies for GitHub Actions
10+
- package-ecosystem: "github-actions"
11+
directory: "/"
12+
schedule:
13+
interval: "daily"
14+
# Allow up to 1 open pull requests
15+
open-pull-requests-limit: 1
16+
# Add reviewers
17+
reviewers:
18+
- abhinavsingh
19+
20+
# Maintain dependencies for npm
21+
- package-ecosystem: "npm"
22+
directory: "/dashboard"
23+
schedule:
24+
interval: "daily"
25+
# Allow up to 1 open pull requests
26+
open-pull-requests-limit: 1
27+
reviewers:
28+
- abhinavsingh
29+
# Prefix all commit messages with "npm"
30+
commit-message:
31+
prefix: "npm"
32+
33+
# Maintain dependencies for pip
34+
- package-ecosystem: "pip"
35+
directory: "/"
36+
schedule:
37+
interval: "daily"
38+
# Allow up to 1 open pull requests
39+
open-pull-requests-limit: 1
40+
reviewers:
41+
- abhinavsingh
42+
# Include a list of updated dependencies
43+
# with a prefix determined by the dependency group
44+
commit-message:
45+
prefix: "pip prod"
46+
prefix-development: "pip dev"
47+
include: "scope"
48+
...

.github/workflows/test-library.yml

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,7 @@ jobs:
265265
- name: Setup git user as [bot]
266266
if: >-
267267
fromJSON(needs.pre-setup.outputs.is-untagged-devel)
268-
run: >
269-
git config --local user.email
270-
'github-actions[bot]@users.noreply.github.com'
271-
272-
git config --local user.name 'github-actions[bot]'
268+
uses: fregante/[email protected]
273269
- name: >-
274270
Tag the release in the local Git repo
275271
as ${{ needs.pre-setup.outputs.git-tag }}
@@ -755,11 +751,7 @@ jobs:
755751
fetch-depth: 1
756752
ref: ${{ github.event.inputs.release-commitish }}
757753
- name: Setup git user as [bot]
758-
run: >
759-
git config --local user.email
760-
'github-actions[bot]@users.noreply.github.com'
761-
762-
git config --local user.name 'github-actions[bot]'
754+
uses: fregante/[email protected]
763755

764756
- name: >-
765757
Tag the release in the local Git repo
@@ -772,4 +764,38 @@ jobs:
772764
to the just published release back to GitHub
773765
run: >-
774766
git push --atomic origin '${{ needs.pre-setup.outputs.git-tag }}'
767+
768+
publish-github-release:
769+
name: >-
770+
Publish a GitHub Release for
771+
${{ needs.pre-setup.outputs.git-tag }}
772+
needs:
773+
- post-release-repo-update
774+
- pre-setup # transitive, for accessing settings
775+
runs-on: Ubuntu-latest
776+
777+
permissions:
778+
contents: write
779+
780+
steps:
781+
- name: Download all the dists
782+
uses: actions/download-artifact@v2
783+
with:
784+
name: python-package-distributions
785+
path: dist/
786+
787+
- name: >-
788+
Publish a GitHub Release for
789+
${{ needs.pre-setup.outputs.git-tag }}
790+
uses: softprops/action-gh-release@v1
791+
with:
792+
# body/body_path: # FIXME: Use once Towncrier is integrated.
793+
discussion_category_name: Announcements
794+
fail_on_unmatched_files: true
795+
files: |
796+
dist/${{ needs.pre-setup.outputs.sdist-artifact-name }}
797+
dist/${{ needs.pre-setup.outputs.wheel-artifact-name }}
798+
name: ${{ needs.pre-setup.outputs.git-tag }}
799+
tag_name: ${{ needs.pre-setup.outputs.git-tag }}
800+
target_commitish: ${{ github.event.inputs.release-commitish }}
775801
...

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,7 @@ usage: -m [-h] [--enable-events] [--enable-conn-pool] [--threadless]
20382038
[--filtered-url-regex-config FILTERED_URL_REGEX_CONFIG]
20392039
[--cloudflare-dns-mode CLOUDFLARE_DNS_MODE]
20402040

2041-
proxy.py v2.3.2.dev193+g87ff921.d20211121
2041+
proxy.py v2.3.2.dev183+g808caa1.d20211124
20422042

20432043
options:
20442044
-h, --help show this help message and exit

0 commit comments

Comments
 (0)