Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HAUKI-669 | Switch to common reusable CI workflow #254

Merged
merged 3 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .commitlintrc.js → .commitlintrc.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
extends: [
'@commitlint/config-conventional'
],
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion deploy/wait-for-it.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ if [[ $WAITFORIT_CLI != "" ]]; then
exec "${WAITFORIT_CLI[@]}"
else
exit $WAITFORIT_RESULT
fi
fi
2 changes: 1 addition & 1 deletion hours/tests/fixtures/test_import_hauki_periods.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@
}
]
}
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -480,4 +480,4 @@
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -473,4 +473,4 @@
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,4 @@
}
]
}
}
}
2 changes: 1 addition & 1 deletion hours/tests/fixtures/test_import_tprek_units.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@
"created_time": "2016-09-22T10:17:58",
"modified_time": "2020-10-28T00:32:36"
}
]
]
2 changes: 1 addition & 1 deletion load-tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
Loading