Skip to content

Commit 49595aa

Browse files
Merge branch 'master' into dependabot/npm_and_yarn/docker/sync-wrap/multi-e7bf267bf3
2 parents 798edba + d1e3fd9 commit 49595aa

15 files changed

Lines changed: 2876 additions & 1890 deletions
File renamed without changes.

.github/dependabot.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
version: 2
2+
updates:
3+
4+
# ---------------------------
5+
# Python (Poetry via pip)
6+
# ---------------------------
7+
- package-ecosystem: "pip"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"
11+
target-branch: "master"
12+
labels: ["dependencies", "python", "poetry"]
13+
open-pull-requests-limit: 10
14+
ignore:
15+
- dependency-name: "*"
16+
update-types: ["version-update:semver-major"]
17+
18+
# ---------------------------
19+
# NodeJS (root)
20+
# ---------------------------
21+
- package-ecosystem: "npm"
22+
directory: "/"
23+
schedule:
24+
interval: "daily"
25+
target-branch: "master"
26+
labels: ["dependencies", "npm"]
27+
open-pull-requests-limit: 10
28+
ignore:
29+
- dependency-name: "*"
30+
update-types: ["version-update:semver-major"]
31+
32+
# ---------------------------
33+
# Docker (Dockerfile updates)
34+
# ---------------------------
35+
- package-ecosystem: "docker"
36+
directory: "/docker"
37+
schedule:
38+
interval: "daily"
39+
target-branch: "master"
40+
labels: ["dependencies", "docker"]
41+
open-pull-requests-limit: 10
42+
43+
# ---------------------------
44+
# GitHub Actions
45+
# ---------------------------
46+
- package-ecosystem: "github-actions"
47+
directory: "/"
48+
schedule:
49+
interval: "daily"
50+
target-branch: "master"
51+
labels: ["dependencies", "github-actions"]
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Dependabot auto-merge
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened, synchronize, ready_for_review]
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
automerge:
13+
name: Auto-merge Dependabot patch updates
14+
runs-on: ubuntu-latest
15+
16+
# Only run on Dependabot PRs
17+
if: github.event.pull_request.user.login == 'dependabot[bot]'
18+
19+
steps:
20+
- name: Fetch Dependabot metadata
21+
id: meta
22+
uses: dependabot/fetch-metadata@v2
23+
with:
24+
github-token: ${{ secrets.GITHUB_TOKEN }}
25+
26+
- name: Approve PR
27+
run: gh pr review --approve "$PR_URL"
28+
env:
29+
PR_URL: ${{ github.event.pull_request.html_url }}
30+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
32+
- name: Auto-merge patch updates only
33+
if: steps.meta.outputs.update-type == 'version-update:semver-patch'
34+
run: gh pr merge --auto --squash "$PR_URL"
35+
env:
36+
PR_URL: ${{ github.event.pull_request.html_url }}
37+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

azure/azure-build-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ extends:
6666
inputs:
6767
testResultsFormat: "JUnit"
6868
testResultsFiles: "${{ variables.service_name }}/reports/tests/*.xml"
69-
failTaskOnFailedTests: false
70-
displayName: publish test report
69+
failTaskOnFailedTests: true
70+
displayName: publish test report

azure/azure-pr-pipeline.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ extends:
3939
post_deploy:
4040
- template: templates/e2e.yml
4141
parameters:
42-
test_type: e2e
42+
test_type: e2e
43+
python_version: ${{ variables.python_version}}

azure/azure-release-pipeline.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,31 @@ extends:
4040
- template: templates/e2e.yml
4141
parameters:
4242
test_type: e2e
43+
python_version: ${{ variables.python_version}}
4344
- environment: internal-dev-sandbox
4445
post_deploy:
4546
- template: templates/e2e.yml
4647
parameters:
4748
test_type: smoketest
49+
python_version: ${{ variables.python_version}}
4850
- environment: internal-qa
4951
post_deploy:
5052
- template: templates/e2e.yml
5153
parameters:
5254
test_type: e2e
55+
python_version: ${{ variables.python_version}}
5356
- environment: internal-qa-sandbox
5457
post_deploy:
5558
- template: templates/e2e.yml
5659
parameters:
5760
test_type: smoketest
61+
python_version: ${{ variables.python_version}}
5862
- environment: ref
5963
post_deploy:
6064
- template: templates/e2e.yml
6165
parameters:
6266
test_type: smoketest
67+
python_version: ${{ variables.python_version}}
6368
depends_on:
6469
- internal_qa
6570
- environment: int
@@ -68,6 +73,7 @@ extends:
6873
parameters:
6974
app_id: "84aa2219-7170-4279-93fb-3d37b89bbc01"
7075
test_type: smoketest
76+
python_version: ${{ variables.python_version}}
7177
depends_on:
7278
- internal_qa
7379
- environment: sandbox
@@ -76,6 +82,7 @@ extends:
7682
parameters:
7783
app_id: "a50e2f01-ea28-41c9-8666-850c034ddd82"
7884
test_type: smoketest
85+
python_version: ${{ variables.python_version}}
7986
depends_on:
8087
- internal_qa
8188
- environment: prod
@@ -84,6 +91,7 @@ extends:
8491
parameters:
8592
app_id: "72ada63b-9d70-4ca2-b9f2-cd1ce74c2dde"
8693
test_type: smoketest
94+
python_version: ${{ variables.python_version}}
8795
depends_on:
8896
- int
8997
- ref

azure/project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ variables:
22
service_name: sync-wrap
33
service_base_path: sync-wrap
44
short_service_name: sync-wrap
5-
python_version: 3.10
5+
python_version: "3.10"

azure/templates/e2e.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ parameters:
33
- name: app_id
44
type: string
55
default: ""
6+
- name: python_version
7+
default: ""
68

79
steps:
10+
- task: UsePythonVersion@0
11+
displayName: 'Use Python 3.10'
12+
inputs:
13+
versionSpec: '3.10'
814

915
- task: s3-cache-action@1
1016
inputs:

0 commit comments

Comments
 (0)