Skip to content

Commit a94b691

Browse files
committed
Merge branch 'main' into ansible_automation_update
2 parents d6c48d1 + 61662fc commit a94b691

6 files changed

Lines changed: 55 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
workflow_dispatch:
9+
10+
jobs:
11+
common:
12+
uses: City-of-Helsinki/.github/.github/workflows/ci-django-api.yml@main
13+
secrets: inherit
14+
with:
15+
python-version: 3.11
16+
postgres-major-version: 13
17+
extra-commands: |
18+
echo 'SECRET_KEY=topsecret123' >> .env

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: release-please
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
# manual triggered
88
workflow_dispatch:
99
inputs:
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Generated by Django 5.1.11 on 2025-08-11 06:15
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('audit_log', '0001_initial'),
10+
]
11+
12+
operations = [
13+
migrations.CreateModel(
14+
name='DummyTestModel',
15+
fields=[
16+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
17+
('text_field', models.CharField(max_length=50)),
18+
('number_field', models.IntegerField()),
19+
('boolean_field', models.BooleanField(default=False)),
20+
],
21+
options={
22+
'managed': False,
23+
},
24+
),
25+
]

azure-pipelines-notification-service-api-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pr:
2020
# PR target branch
2121
branches:
2222
include:
23-
- master
23+
- main
2424
paths:
2525
exclude:
2626
- '*release-please*'

azure-pipelines-notification-service-api-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ trigger:
88
batch: true
99
branches:
1010
include:
11-
- master
11+
- main
1212
paths:
1313
exclude:
1414
- '*release-please*'

sonar-project.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
sonar.projectKey = City-of-Helsinki_notification-service-api
2+
sonar.projectName = notification-service-api
3+
sonar.organization = city-of-helsinki
4+
sonar.python.version = 3.11
5+
sonar.python.coverage.reportPaths = coverage.xml
6+
sonar.sources = .
7+
sonar.exclusions = **/migrations/*,**/tests/*
8+
sonar.tests = .
9+
sonar.test.inclusions = **/tests/**/*

0 commit comments

Comments
 (0)