Skip to content

Commit 5ef091d

Browse files
authored
Merge branch 'main' into chore/fix-lint-errors
2 parents 4441432 + 9b7f458 commit 5ef091d

10 files changed

Lines changed: 155 additions & 17 deletions

File tree

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.0.0
2+
current_version = 1.0.1
33
commit = True
44
tag = False
55

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10

.github/workflows/auto-approve.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Auto approve
2+
3+
on:
4+
pull_request_target
5+
6+
jobs:
7+
auto-approve:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: hmarr/auto-approve-action@v2
11+
if: |
12+
(
13+
github.event.pull_request.user.login == 'dependabot[bot]' ||
14+
github.event.pull_request.user.login == 'dependabot' ||
15+
github.event.pull_request.user.login == 'dependabot-preview[bot]' ||
16+
github.event.pull_request.user.login == 'dependabot-preview' ||
17+
github.event.pull_request.user.login == 'renovate[bot]' ||
18+
github.event.pull_request.user.login == 'renovate' ||
19+
github.event.pull_request.user.login == 'github-actions[bot]'
20+
)
21+
&&
22+
(
23+
github.actor == 'dependabot[bot]' ||
24+
github.actor == 'dependabot' ||
25+
github.actor == 'dependabot-preview[bot]' ||
26+
github.actor == 'dependabot-preview' ||
27+
github.actor == 'renovate[bot]' ||
28+
github.actor == 'renovate' ||
29+
github.actor == 'github-actions[bot]'
30+
)
31+
with:
32+
github-token: ${{ secrets.PAT_TOKEN }}

.github/workflows/auto-merge.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: automerge
2+
on:
3+
check_suite:
4+
types:
5+
- completed
6+
7+
jobs:
8+
automerge:
9+
runs-on: ubuntu-latest
10+
if: |
11+
github.actor == 'dependabot[bot]' ||
12+
github.actor == 'dependabot' ||
13+
github.actor == 'dependabot-preview[bot]' ||
14+
github.actor == 'dependabot-preview' ||
15+
github.actor == 'renovate[bot]' ||
16+
github.actor == 'renovate'
17+
steps:
18+
- name: automerge
19+
uses: pascalgn/automerge-action@v0.15.3
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
22+
MERGE_METHOD: "rebase"
23+
UPDATE_METHOD: "rebase"
24+
MERGE_RETRIES: "6"
25+
MERGE_RETRY_SLEEP: "100000"
26+
MERGE_LABELS: ""

.github/workflows/codacy.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# This workflow uses actions that are not certified by GitHub.
2+
# They are provided by a third-party and are governed by
3+
# separate terms of service, privacy policy, and support
4+
# documentation.
5+
6+
# This workflow checks out code, performs a Codacy security scan
7+
# and integrates the results with the
8+
# GitHub Advanced Security code scanning feature. For more information on
9+
# the Codacy security scan action usage and parameters, see
10+
# https://github.com/codacy/codacy-analysis-cli-action.
11+
# For more information on Codacy Analysis CLI in general, see
12+
# https://github.com/codacy/codacy-analysis-cli.
13+
14+
name: Codacy Security Scan
15+
16+
on:
17+
push:
18+
branches: [ "main" ]
19+
pull_request:
20+
# The branches below must be a subset of the branches above
21+
branches: [ "main" ]
22+
schedule:
23+
- cron: '39 21 * * 4'
24+
25+
permissions:
26+
contents: read
27+
28+
jobs:
29+
codacy-security-scan:
30+
permissions:
31+
contents: read # for actions/checkout to fetch code
32+
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
33+
name: Codacy Security Scan
34+
runs-on: ubuntu-latest
35+
steps:
36+
# Checkout the repository to the GitHub Actions runner
37+
- name: Checkout code
38+
uses: actions/checkout@v3
39+
40+
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
41+
- name: Run Codacy Analysis CLI
42+
uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
43+
with:
44+
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
45+
# You can also omit the token and run the tools that support default configurations
46+
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
47+
verbose: true
48+
output: results.sarif
49+
format: sarif
50+
# Adjust severity of non-security issues
51+
gh-code-scanning-compat: true
52+
# Force 0 exit code to allow SARIF file generation
53+
# This will handover control about PR rejection to the GitHub side
54+
max-allowed-issues: 2147483647
55+
56+
# Upload the SARIF file generated in the previous step
57+
- name: Upload SARIF results file
58+
uses: github/codeql-action/upload-sarif@v2
59+
with:
60+
sarif_file: results.sarif

.github/workflows/deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ jobs:
88
deploy:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
with:
1313
fetch-depth: 0
1414

1515
- name: Run semver-diff
1616
id: semver-diff
17-
uses: tj-actions/semver-diff@v1.2.0
17+
uses: tj-actions/semver-diff@v2.0.0
1818

1919
- name: Set up Python
20-
uses: actions/setup-python@v2
20+
uses: actions/setup-python@v4
2121
with:
2222
python-version: '3.6.x'
2323

@@ -43,10 +43,10 @@ jobs:
4343
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
4444

4545
- name: Generate CHANGELOG
46-
uses: tj-actions/github-changelog-generator@v1.8
46+
uses: tj-actions/github-changelog-generator@v1.13
4747

4848
- name: Create Pull Request
49-
uses: peter-evans/create-pull-request@v3
49+
uses: peter-evans/create-pull-request@v4
5050
with:
5151
base: "main"
5252
title: "Upgraded ${{ steps.semver-diff.outputs.old_version }} → ${{ steps.semver-diff.outputs.new_version }}"

CHANGELOG.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [v1.0.1](https://github.com/tj-python/github-deploy/tree/v1.0.1) (2022-06-12)
4+
5+
[Full Changelog](https://github.com/tj-python/github-deploy/compare/v1.0.0...v1.0.1)
6+
7+
**Merged pull requests:**
8+
9+
- Bump actions/setup-python from 2 to 4 [\#14](https://github.com/tj-python/github-deploy/pull/14) ([dependabot[bot]](https://github.com/apps/dependabot))
10+
- Bump peter-evans/create-pull-request from 3 to 4 [\#13](https://github.com/tj-python/github-deploy/pull/13) ([dependabot[bot]](https://github.com/apps/dependabot))
11+
- Bump tj-actions/semver-diff from 1.2.0 to 2.0.0 [\#12](https://github.com/tj-python/github-deploy/pull/12) ([dependabot[bot]](https://github.com/apps/dependabot))
12+
- Bump tj-actions/github-changelog-generator from 1.8 to 1.13 [\#11](https://github.com/tj-python/github-deploy/pull/11) ([dependabot[bot]](https://github.com/apps/dependabot))
13+
- Bump actions/checkout from 2 to 3 [\#10](https://github.com/tj-python/github-deploy/pull/10) ([dependabot[bot]](https://github.com/apps/dependabot))
14+
- feat: Improve error handling [\#9](https://github.com/tj-python/github-deploy/pull/9) ([jackton1](https://github.com/jackton1))
15+
- Upgraded 0.0.9 → v1.0.0 [\#8](https://github.com/tj-python/github-deploy/pull/8) ([jackton1](https://github.com/jackton1))
16+
317
## [v1.0.0](https://github.com/tj-python/github-deploy/tree/v1.0.0) (2022-02-12)
418

519
[Full Changelog](https://github.com/tj-python/github-deploy/compare/0.0.9...v1.0.0)
@@ -22,15 +36,15 @@
2236

2337
## [0.0.7](https://github.com/tj-python/github-deploy/tree/0.0.7) (2021-11-15)
2438

25-
[Full Changelog](https://github.com/tj-python/github-deploy/compare/0.0.5...0.0.7)
39+
[Full Changelog](https://github.com/tj-python/github-deploy/compare/0.0.6...0.0.7)
2640

27-
## [0.0.5](https://github.com/tj-python/github-deploy/tree/0.0.5) (2021-11-15)
41+
## [0.0.6](https://github.com/tj-python/github-deploy/tree/0.0.6) (2021-11-15)
2842

29-
[Full Changelog](https://github.com/tj-python/github-deploy/compare/0.0.6...0.0.5)
43+
[Full Changelog](https://github.com/tj-python/github-deploy/compare/0.0.5...0.0.6)
3044

31-
## [0.0.6](https://github.com/tj-python/github-deploy/tree/0.0.6) (2021-11-15)
45+
## [0.0.5](https://github.com/tj-python/github-deploy/tree/0.0.5) (2021-11-15)
3246

33-
[Full Changelog](https://github.com/tj-python/github-deploy/compare/0.0.4...0.0.6)
47+
[Full Changelog](https://github.com/tj-python/github-deploy/compare/0.0.4...0.0.5)
3448

3549
**Merged pull requests:**
3650

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ This can introduce a number challenges one of which is maintaining consistency a
1212

1313
> For example adding a github action or maintaing a consistent pull request template accross your organization.
1414
15-
1615
## Solution
1716

1817
`github-deploy` makes maintaining such configurations as easy as a single command.
@@ -36,17 +35,17 @@ The required scopes are `repo` and `workflow`
3635

3736
## Usage
3837

39-
### Creating or Updating files on github
38+
### Upload files to github
4039

4140

4241
```shell script
43-
gh-deploy update --org [org] --token [PAT_TOKEN] --dest [LOCATION TO UPLOAD FILE] --source [SOURCE FILE LOCATION]
42+
gh-deploy upload --org [org] --token [PAT_TOKEN] --dest [LOCATION TO UPLOAD FILE] --source [SOURCE FILE LOCATION]
4443
```
4544

4645
Example:
4746

4847
```shell script
49-
gh-deploy update --org tj-actions --token [PAT_TOKEN] --dest '.github/workflows/auto-approve.yml' --source auto-approve.yml
48+
gh-deploy upload --org tj-actions --token [PAT_TOKEN] --dest '.github/workflows/auto-approve.yml' --source auto-approve.yml
5049
```
5150

5251
> NOTE: `auto-approve.yml` is located on your local system.

github_deploy/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def get_command(self, ctx, name):
2727
eval(code, ns, ns)
2828
return ns["main"]
2929

30-
ctx.fail("Invalid Command: {name}".format(name=name))
30+
ctx.fail("Invalid Command \"{name}\"".format(name=name))
3131

3232

3333
main = GithubDeploy(

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
setup(
2525
name="github-deploy",
26-
version="1.0.0",
26+
version="1.0.1",
2727
description="Deploy yaml files to a large number of repositories in seconds.",
2828
long_description=LONG_DESCRIPTION,
2929
long_description_content_type=LONG_DESCRIPTION_TYPE,

0 commit comments

Comments
 (0)