From 46f9a8a5009b59a976e7afb1c64df7ebc4d6f3f5 Mon Sep 17 00:00:00 2001
From: Nico Virkki <nico.virkki@anders.com>
Date: Thu, 28 Nov 2024 12:26:31 +0200
Subject: [PATCH 1/3] ci: switch to common reusable gh CI workflow

Refs HAUKI-669
---
 .github/workflows/ci.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..3d55115e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  common:
+    uses: City-of-Helsinki/.github/.github/workflows/ci-django-api.yml@main
+    secrets: inherit
+    with:
+      python-version: 3.9
+      postgres-major-version: 13
+      use-postgis: true

From 3f6e198663cb20940ead015abd893bcd49585b1c Mon Sep 17 00:00:00 2001
From: Nico Virkki <nico.virkki@anders.com>
Date: Thu, 28 Nov 2024 12:50:30 +0200
Subject: [PATCH 2/3] chore: clean eols and whitespaces

Refs HAUKI-669
---
 deploy/wait-for-it.sh                                        | 2 +-
 hours/tests/fixtures/test_import_hauki_periods.json          | 2 +-
 hours/tests/fixtures/test_import_kirjastot_data_complex.json | 2 +-
 hours/tests/fixtures/test_import_kirjastot_data_pattern.json | 2 +-
 hours/tests/fixtures/test_import_kirjastot_data_simple.json  | 2 +-
 hours/tests/fixtures/test_import_tprek_units.json            | 2 +-
 load-tests/run.sh                                            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deploy/wait-for-it.sh b/deploy/wait-for-it.sh
index 92cbdbb3..5e8679e5 100755
--- a/deploy/wait-for-it.sh
+++ b/deploy/wait-for-it.sh
@@ -179,4 +179,4 @@ if [[ $WAITFORIT_CLI != "" ]]; then
     exec "${WAITFORIT_CLI[@]}"
 else
     exit $WAITFORIT_RESULT
-fi
\ No newline at end of file
+fi
diff --git a/hours/tests/fixtures/test_import_hauki_periods.json b/hours/tests/fixtures/test_import_hauki_periods.json
index d9adb8a5..ad8a721d 100644
--- a/hours/tests/fixtures/test_import_hauki_periods.json
+++ b/hours/tests/fixtures/test_import_hauki_periods.json
@@ -169,4 +169,4 @@
             }
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/hours/tests/fixtures/test_import_kirjastot_data_complex.json b/hours/tests/fixtures/test_import_kirjastot_data_complex.json
index bd6f3d9e..84c043eb 100644
--- a/hours/tests/fixtures/test_import_kirjastot_data_complex.json
+++ b/hours/tests/fixtures/test_import_kirjastot_data_complex.json
@@ -480,4 +480,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/hours/tests/fixtures/test_import_kirjastot_data_pattern.json b/hours/tests/fixtures/test_import_kirjastot_data_pattern.json
index 417d95fa..d966678b 100644
--- a/hours/tests/fixtures/test_import_kirjastot_data_pattern.json
+++ b/hours/tests/fixtures/test_import_kirjastot_data_pattern.json
@@ -473,4 +473,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/hours/tests/fixtures/test_import_kirjastot_data_simple.json b/hours/tests/fixtures/test_import_kirjastot_data_simple.json
index 80508452..cb913272 100644
--- a/hours/tests/fixtures/test_import_kirjastot_data_simple.json
+++ b/hours/tests/fixtures/test_import_kirjastot_data_simple.json
@@ -175,4 +175,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/hours/tests/fixtures/test_import_tprek_units.json b/hours/tests/fixtures/test_import_tprek_units.json
index 8a3142c1..a1dc8348 100644
--- a/hours/tests/fixtures/test_import_tprek_units.json
+++ b/hours/tests/fixtures/test_import_tprek_units.json
@@ -159,4 +159,4 @@
         "created_time": "2016-09-22T10:17:58",
         "modified_time": "2020-10-28T00:32:36"
     }
-]
\ No newline at end of file
+]
diff --git a/load-tests/run.sh b/load-tests/run.sh
index 37388a1f..6a8828d1 100755
--- a/load-tests/run.sh
+++ b/load-tests/run.sh
@@ -6,4 +6,4 @@ export API_URL=https://hauki.api.stage.hel.ninja/v1
 
 # export AUTH_PARAMS=$(node ../scripts/generate-auth-params.js)
 
-k6 run "$@" 
+k6 run "$@"

From 8ef0d3b5a33a0c19baba417e406154e119b8f3fe Mon Sep 17 00:00:00 2001
From: Nico Virkki <nico.virkki@anders.com>
Date: Thu, 28 Nov 2024 14:01:26 +0200
Subject: [PATCH 3/3] chore: convert commitlintrc.js to mjs

Refs HAUKI-669
---
 .commitlintrc.js => .commitlintrc.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .commitlintrc.js => .commitlintrc.mjs (97%)

diff --git a/.commitlintrc.js b/.commitlintrc.mjs
similarity index 97%
rename from .commitlintrc.js
rename to .commitlintrc.mjs
index 4e715ad5..ae4ffd16 100644
--- a/.commitlintrc.js
+++ b/.commitlintrc.mjs
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   extends: [
     '@commitlint/config-conventional'
   ],