Skip to content

Commit

Permalink
Merge branch 'develop' into optimize
Browse files Browse the repository at this point in the history
  • Loading branch information
abhinavsingh authored Nov 24, 2021
2 parents 941c31b + 833eeba commit 0a4af45
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 11 deletions.
48 changes: 48 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
# Allow up to 1 open pull requests
open-pull-requests-limit: 1
# Add reviewers
reviewers:
- abhinavsingh

# Maintain dependencies for npm
- package-ecosystem: "npm"
directory: "/dashboard"
schedule:
interval: "daily"
# Allow up to 1 open pull requests
open-pull-requests-limit: 1
reviewers:
- abhinavsingh
# Prefix all commit messages with "npm"
commit-message:
prefix: "npm"

# Maintain dependencies for pip
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"
# Allow up to 1 open pull requests
open-pull-requests-limit: 1
reviewers:
- abhinavsingh
# Include a list of updated dependencies
# with a prefix determined by the dependency group
commit-message:
prefix: "pip prod"
prefix-development: "pip dev"
include: "scope"
...
46 changes: 36 additions & 10 deletions .github/workflows/test-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,7 @@ jobs:
- name: Setup git user as [bot]
if: >-
fromJSON(needs.pre-setup.outputs.is-untagged-devel)
run: >
git config --local user.email
'github-actions[bot]@users.noreply.github.com'
git config --local user.name 'github-actions[bot]'
uses: fregante/[email protected]
- name: >-
Tag the release in the local Git repo
as ${{ needs.pre-setup.outputs.git-tag }}
Expand Down Expand Up @@ -755,11 +751,7 @@ jobs:
fetch-depth: 1
ref: ${{ github.event.inputs.release-commitish }}
- name: Setup git user as [bot]
run: >
git config --local user.email
'github-actions[bot]@users.noreply.github.com'
git config --local user.name 'github-actions[bot]'
uses: fregante/[email protected]

- name: >-
Tag the release in the local Git repo
Expand All @@ -772,4 +764,38 @@ jobs:
to the just published release back to GitHub
run: >-
git push --atomic origin '${{ needs.pre-setup.outputs.git-tag }}'
publish-github-release:
name: >-
Publish a GitHub Release for
${{ needs.pre-setup.outputs.git-tag }}
needs:
- post-release-repo-update
- pre-setup # transitive, for accessing settings
runs-on: Ubuntu-latest

permissions:
contents: write

steps:
- name: Download all the dists
uses: actions/download-artifact@v2
with:
name: python-package-distributions
path: dist/

- name: >-
Publish a GitHub Release for
${{ needs.pre-setup.outputs.git-tag }}
uses: softprops/action-gh-release@v1
with:
# body/body_path: # FIXME: Use once Towncrier is integrated.
discussion_category_name: Announcements
fail_on_unmatched_files: true
files: |
dist/${{ needs.pre-setup.outputs.sdist-artifact-name }}
dist/${{ needs.pre-setup.outputs.wheel-artifact-name }}
name: ${{ needs.pre-setup.outputs.git-tag }}
tag_name: ${{ needs.pre-setup.outputs.git-tag }}
target_commitish: ${{ github.event.inputs.release-commitish }}
...
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2038,7 +2038,7 @@ usage: -m [-h] [--enable-events] [--enable-conn-pool] [--threadless]
[--filtered-url-regex-config FILTERED_URL_REGEX_CONFIG]
[--cloudflare-dns-mode CLOUDFLARE_DNS_MODE]

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

options:
-h, --help show this help message and exit
Expand Down

0 comments on commit 0a4af45

Please sign in to comment.