JustScreaMy/facturio
1
0
Fork 0
Code Issues 1 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Draft: Gitlab CI #8

Open
Ghost wants to merge 11 commits from 12-gitlab-ci into master
pull from: 12-gitlab-ci
merge into: JustScreaMy:master
Conversation 16 Commits 11 Files changed 11 +245 -1
Ghost commented 2024-02-16 14:55:48 +00:00 (Migrated from git.katuwoss.dev)
Copy link
No description provided.
Ghost commented 2024-02-16 14:55:49 +00:00 (Migrated from git.katuwoss.dev)
Copy link

assigned to @JustScreaMy

assigned to @JustScreaMy
Ghost commented 2024-08-16 20:17:10 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 3 commits

  • 74b4ef7f...a79745da - 2 commits from branch master
  • 8a8732d6 - start of gitlab-ci

Compare with previous version

added 3 commits <ul><li>74b4ef7f...a79745da - 2 commits from branch <code>master</code></li><li>8a8732d6 - start of gitlab-ci</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094502967&start_sha=74b4ef7fb1be0c547bb5fdff475c18c7968c234a)
Ghost commented 2024-08-17 18:59:00 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>55924629 - 1 commit from branch <code>master</code></li><li>3b7297c2 - start of gitlab-ci</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094704025&start_sha=8a8732d6d2abe0de89277e4f1296d785e100d5b2)
Ghost commented 2024-08-17 19:29:16 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>1902147f - application dockerized</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094706541&start_sha=3b7297c2fe93b9495fa3ed5aea87bc2e5f187079)
Ghost commented 2024-08-17 19:29:23 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9ef53494 - base build?</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094706549&start_sha=1902147f820c6cc3d6479fdb5290acad0581d914)
Ghost commented 2024-08-17 19:31:17 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>d3302840 - i need docker here</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094706675&start_sha=9ef53494096cedcc6f37e197f922bcbab245e643)
Ghost commented 2024-08-17 19:38:37 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>e5d383f0 - fix casing</li><li>c64c5788 - added tagging and pushing?</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094707261&start_sha=d33028409f783adae90d023855ed1c75f12dc35b)
Ghost commented 2024-08-17 19:40:31 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>fede8d03 - auth fix?</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094707468&start_sha=c64c5788183fb6361bf7278a370f5b0efd808dd5)
Ghost commented 2024-08-17 19:44:09 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9d216697 - reorganized</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094707711&start_sha=fede8d0320794c13d9c3d0bc11e8d1f1dea8bf60)
Ghost commented 2024-08-17 19:46:41 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

  • ffdb71d0 - pre-commit run?

Compare with previous version

added 1 commit <ul><li>ffdb71d0 - pre-commit run?</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094707859&start_sha=9d216697889b9e946e9de29deeac028f4c826887)
Ghost commented 2024-08-17 19:47:59 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

  • 9be7cc2e - pre-commit run?

Compare with previous version

added 1 commit <ul><li>9be7cc2e - pre-commit run?</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094707986&start_sha=ffdb71d092bc514568c54ab9ad54cb0439dce916)
Ghost commented 2024-08-17 19:49:35 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

  • bdb66dfd - pre-commit run?

Compare with previous version

added 1 commit <ul><li>bdb66dfd - pre-commit run?</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094708137&start_sha=9be7cc2e40738f8075fff0da2f5888a17fa52b92)
Ghost commented 2024-08-17 19:51:45 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>2b306764 - pre-commit run?</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1094708306&start_sha=bdb66dfdd0f25451702bca53b7b4c1fed4f2d366)
Ghost commented 2024-08-19 20:39:15 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

  • 23d6207e - development docker-compose.yml for database and stuff

Compare with previous version

added 1 commit <ul><li>23d6207e - development docker-compose.yml for database and stuff</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1095893702&start_sha=2b306764316a3464546e6f7dc7afafd6c09d79d4)
Ghost commented 2024-08-19 20:39:52 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

  • 928b2884 - development docker-compose.yml for database and stuff

Compare with previous version

added 1 commit <ul><li>928b2884 - development docker-compose.yml for database and stuff</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1095894055&start_sha=23d6207ef65ba207a9560766018b131cdf8f1167)
Ghost commented 2024-08-19 20:42:56 +00:00 (Migrated from git.katuwoss.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>bef7f44a - build yaml</li></ul> [Compare with previous version](/JustScreaMy/facturio/-/merge_requests/8/diffs?diff_id=1095895939&start_sha=928b28845bee6715877b04209370adff89b8fcbc)
This pull request has changes conflicting with the target branch.
  • .dockerignore
  • Dockerfile
  • docker-compose.build.yml
  • docker-compose.yml
  • poetry.lock
  • pyproject.toml
  • scripts/__init__.py
  • scripts/apps.py
  • scripts/entrypoint.sh
  • scripts/management/__init__.py
  • scripts/management/commands/__init__.py
  • scripts/management/commands/runscheduler.py
  • scripts/run-dev.sh
  • scripts/run.sh
  • scripts/start.sh
  • scripts/tasks.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 12-gitlab-ci:12-gitlab-ci
git switch 12-gitlab-ci

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff 12-gitlab-ci
git switch 12-gitlab-ci
git rebase master
git switch master
git merge --ff-only 12-gitlab-ci
git switch 12-gitlab-ci
git rebase master
git switch master
git merge --no-ff 12-gitlab-ci
git switch master
git merge --squash 12-gitlab-ci
git switch master
git merge --ff-only 12-gitlab-ci
git switch master
git merge 12-gitlab-ci
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
JustScreaMy/facturio!8
No description provided.