Skip to content

Commit 176daab

Browse files
sbrunnersbrunner
authored
Merge pull request #956 from sbrunner/test
New Release
2 parents 10b3bc6 + b104815 commit 176daab

25 files changed

+3051
-2820
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
1010
max_line_length = 110
1111
quote_type = single
1212

13-
[*.{yaml,json,json5,md}]
13+
[*.{yaml,json,json5,md,whitesource}]
1414
indent_size = 2
1515

1616
[{Makefile, *.mk}]

‎.github/changelog-config.yaml

-24
This file was deleted.

‎.github/renovate.json5

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
{
22
extends: ['config:base'],
33
timezone: 'Europe/Zurich',
4-
schedule: 'after 1am on Saturday',
4+
schedule: 'after 5pm on the first day of the month',
55
labels: ['dependencies'],
66
separateMajorMinor: true,
77
separateMinorPatch: true,
88
prHourlyLimit: 0,
99
prConcurrentLimit: 0,
10-
lockFileMaintenance: { enabled: true, automerge: true },
10+
lockFileMaintenance: {
11+
enabled: true,
12+
automerge: true,
13+
schedule: 'after 5pm on the first day of the month',
14+
},
15+
baseBranches: ['master', 'test'],
16+
'pre-commit': { enabled: true },
17+
regexManagers: [
18+
{
19+
fileMatch: ['^.pre-commit-config.yaml'],
20+
matchStrings: [" +- '?(?<depName>[^' @=]+)(@|==)(?<currentValue>[^' @=]+)'? # (?<datasource>.+)"],
21+
},
22+
],
1123
packageRules: [
1224
/** Automerge the patch, the minor and the dev dependency */
1325
{
@@ -37,7 +49,8 @@
3749
},
3850
/** Group Poetry packages */
3951
{
40-
matchPackageNames: ['poetry', 'poetry-core'],
52+
matchPackageNames: ['poetry', 'pip'],
53+
matchPackagePrefixes: ['poetry-'],
4154
groupName: 'Poetry',
4255
automerge: true,
4356
separateMajorMinor: false,
@@ -49,5 +62,11 @@
4962
matchPackageNames: ['c2cciutils'],
5063
enabled: false,
5164
},
65+
/** Accept only the patch on stabilization branches */
66+
{
67+
matchBaseBranches: ['master'],
68+
matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'],
69+
enabled: false,
70+
},
5271
],
5372
}

‎.github/workflows/audit.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Audit
2+
3+
on:
4+
schedule:
5+
- cron: '30 2 * * *'
6+
7+
jobs:
8+
audit:
9+
runs-on: ubuntu-22.04
10+
name: Audit
11+
timeout-minutes: 10
12+
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
branch:
17+
- master
18+
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
ref: ${{ matrix.branch }}
23+
24+
- run: git config --global user.email "[email protected]"
25+
- run: git config --global user.name "Snyk autofix"
26+
27+
- run: python3 -m venv ~/.venv
28+
- run: ~/.venv/bin/pip install --pre c2cciutils[audit]
29+
- run: python3 -m pip install --pre c2cciutils[audit]
30+
31+
- name: Audit
32+
run: ~/.venv/bin/c2cciutils-audit --branch=${{ matrix.branch }}
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.TOKEN }}
35+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

‎.github/workflows/changelog.yaml

+24-38
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,45 @@
11
name: Changelog Generator
22

33
on:
4+
schedule:
5+
- cron: '0 0 * * 1'
46
push:
5-
branches:
6-
- test
77
tags:
8-
- '*'
8+
- '*.*.*'
99

1010
jobs:
1111
changelog:
1212
name: Changelog Generator
13-
runs-on: ubuntu-20.04
14-
timeout-minutes: 10
13+
runs-on: ubuntu-22.04
14+
timeout-minutes: 30
1515

1616
steps:
17-
- uses: actions/checkout@v3
18-
19-
- run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
20-
- run: python3 -m pip install --user --requirement=ci/requirements.txt
17+
- name: Create release
18+
run: |
19+
if [[ ${{ env.GITHUB_REF_NAME }} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
20+
gh release create ${{ env.GITHUB_REF_NAME }}
21+
fi
22+
if: env.GITHUB_REF_TYPE == 'tag'
2123

2224
- name: Get Date
2325
id: get-date
2426
run: |
25-
echo "::set-output name=date::$(/bin/date -u "+%Y%m%d%H%M%S")"
27+
echo "date=$(/bin/date -u "+%Y%m%d%H%M%S")" >> $GITHUB_OUTPUT
2628
- uses: actions/cache@v3
2729
with:
28-
path: |
29-
.github/changelog-generator-cache
30-
key: changelog-${{ steps.get-date.outputs.date }}
30+
path: .cache
31+
key: automation-${{ steps.get-date.outputs.date }}
3132
restore-keys: |
32-
changelog-
33+
automation-
3334
34-
- name: Get config
35-
id: config
36-
run: echo ::set-output name=config::$(python -c 'print(__import__("json").dumps(__import__("yaml").load(open(".github/changelog-config.yaml"), Loader=__import__("yaml").SafeLoader)))')
35+
- run: docker pull aeonphp/automation
3736
- name: Generate changelog
38-
id: changelog
39-
uses: heinrichreimer/[email protected]
40-
with:
41-
token: ${{ secrets.TOKEN }}
42-
configureSections: ${{ steps.config.outputs.config }}
43-
cacheFile: .github/changelog-generator-cache
44-
unreleased: false
45-
46-
- run: c2cciutils-checks --fix --check=prettier
47-
- id: status
48-
run: echo ::set-output name=status::$(git status --short)
49-
- run: |
50-
git add CHANGELOG.md
51-
git config --global user.email "[email protected]"
52-
git config --global user.name "CI"
53-
git commit -m "Update the changelog"
54-
git checkout -b changelog-update
55-
git push origin changelog-update -f
56-
gh pr create --base=master --fill --label=chore || true
37+
run: >
38+
docker run --env=AEON_AUTOMATION_GH_TOKEN --rm --volume=$(pwd)/.cache:/cache aeonphp/automation
39+
changelog:generate:all
40+
${{ github.repository }}
41+
--github-release-update
42+
--cache-path=/cache
43+
-v
5744
env:
58-
GITHUB_TOKEN: ${{ secrets.TOKEN }}
59-
if: steps.status.outputs.status != ''
45+
AEON_AUTOMATION_GH_TOKEN: ${{ secrets.TOKEN }}

‎.github/workflows/delete-old-workflows-run.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Delete old workflow runs
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
7+
env:
8+
HAS_SECRETS: ${{ secrets.HAS_SECRETS }}
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-20.04
13+
timeout-minutes: 25
14+
name: Delete old workflow runs
15+
16+
steps:
17+
- name: Delete old workflow runs
18+
uses: MajorScruffy/[email protected]
19+
with:
20+
repository: ${{ github.repository }}
21+
older-than-seconds: 43200000 # 500 days
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/main.yaml

+16-1
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,23 @@ jobs:
3232
- run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
3333
- run: python3 -m pip install --user --requirement=ci/requirements.txt
3434

35+
- uses: actions/cache@v3
36+
with:
37+
path: ~/.cache/pre-commit
38+
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
39+
restore-keys: "pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}\npre-commit-"
40+
- run: pre-commit run --all-files
3541
- name: Checks
3642
run: c2cciutils-checks
43+
env:
44+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
45+
3746
- name: GitHub event
3847
run: echo ${GITHUB_EVENT} | python3 -m json.tool
3948
env:
4049
GITHUB_EVENT: ${{ toJson(github) }}
4150

42-
# the if the generated files are up to date
51+
# the if the generated files are up to date
4352
- run: make jsonschema
4453
- run: git diff --quiet
4554
- run: git diff
@@ -87,10 +96,16 @@ jobs:
8796
- name: Publish
8897
run: c2cciutils-publish
8998
if: env.HAS_SECRETS == 'HAS_SECRETS'
99+
env:
100+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
101+
GITHUB_TOKEN: ${{ secrets.TOKEN_NEW }}
90102

91103
- run: make build-all
92104

93105
- name: Publish Docker all
94106
run: |
95107
c2cciutils-publish --group=docker-all
96108
if: env.HAS_SECRETS == 'HAS_SECRETS'
109+
env:
110+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
111+
GITHUB_TOKEN: ${{ secrets.TOKEN_NEW }}

‎.github/workflows/pr-checks.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ jobs:
2626
run: c2cciutils-pull-request-checks
2727
env:
2828
GITHUB_EVENT: ${{ toJson(github) }}
29+
GITHUB_TOKEN: ${{ secrets.TOKEN }}

‎.github/workflows/rebuild.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929

3030
- name: Checks
3131
run: c2cciutils-checks
32+
env:
33+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
3234

3335
# the if the generated files are up to date
3436
- run: make jsonschema
@@ -74,10 +76,16 @@ jobs:
7476

7577
- name: Publish
7678
run: c2cciutils-publish --group=docker --type=rebuild --branch=${{ matrix.branch }}
79+
env:
80+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
81+
GITHUB_TOKEN: ${{ secrets.TOKEN_NEW }}
7782

7883
- run: make build-all
7984

8085
- name: Publish Docker all
8186
run: |
8287
c2cciutils-publish --group=docker-all
8388
if: env.HAS_SECRETS == 'HAS_SECRETS'
89+
env:
90+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
91+
GITHUB_TOKEN: ${{ secrets.TOKEN_NEW }}

‎.pre-commit-config.yaml

+66-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,57 @@
1-
ci:
2-
skip:
3-
- copyright
4-
51
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.4.0
4+
hooks:
5+
- id: detect-private-key
6+
- id: check-merge-conflict
7+
- id: check-ast
8+
- id: debug-statements
9+
- id: check-toml
10+
- id: check-yaml
11+
- id: check-json
12+
- id: end-of-file-fixer
13+
- id: trailing-whitespace
14+
- id: mixed-line-ending
615
- repo: https://github.com/sbrunner/pre-commit-copyright
716
rev: 0.2.3
817
hooks:
918
- id: copyright
19+
- repo: https://github.com/codespell-project/codespell
20+
rev: v2.2.2
21+
hooks:
22+
- id: codespell
23+
exclude: ^(.*/)?poetry\.lock$
24+
- repo: https://github.com/pre-commit/mirrors-prettier
25+
rev: v2.7.1
26+
hooks:
27+
- id: prettier
28+
additional_dependencies:
29+
- [email protected] # npm
30+
- [email protected] # npm
31+
- [email protected] # npm
32+
- '@prettier/[email protected]' # npm
33+
- repo: https://github.com/shellcheck-py/shellcheck-py
34+
rev: v0.9.0.2
35+
hooks:
36+
- id: shellcheck
37+
- repo: https://github.com/jumanjihouse/pre-commit-hooks
38+
rev: 3.0.0
39+
hooks:
40+
- id: git-check
41+
- repo: https://github.com/python-jsonschema/check-jsonschema
42+
rev: 0.21.0
43+
hooks:
44+
- id: check-github-workflows
45+
- id: check-renovate
46+
additional_dependencies:
47+
- pyjson5==1.6.2 # pypi
48+
- repo: https://github.com/sirwart/ripsecrets
49+
rev: v0.1.5
50+
hooks:
51+
- id: ripsecrets
52+
exclude: "(^\
53+
thepaperlessproject-paperless-webserver.json\
54+
|thepaperlessproject-paperless-consumer.json)"
1055
- repo: https://github.com/psf/black
1156
rev: 23.1.0
1257
hooks:
@@ -15,3 +60,20 @@ repos:
1560
rev: 5.12.0
1661
hooks:
1762
- id: isort
63+
- repo: https://github.com/PyCQA/autoflake
64+
rev: v2.0.1
65+
hooks:
66+
- id: autoflake
67+
- repo: https://github.com/asottile/pyupgrade
68+
rev: v3.3.1
69+
hooks:
70+
- id: pyupgrade
71+
args:
72+
- --py38-plus
73+
- repo: https://github.com/PyCQA/prospector
74+
rev: v1.8.4
75+
hooks:
76+
- id: prospector
77+
args:
78+
- --tool=pydocstyle
79+
- --die-on-tool-error

‎.whitesource

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"scanSettings": {
3+
"baseBranches": []
4+
},
5+
"checkRunSettings": {
6+
"vulnerableCheckRunConclusionLevel": "failure",
7+
"displayMode": "diff",
8+
"useMendCheckNames": true
9+
},
10+
"issueSettings": {
11+
"minSeverityLevel": "LOW",
12+
"issueType": "DEPENDENCY"
13+
}
14+
}

0 commit comments

Comments
 (0)