Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in
haskell-gargantext
haskell-gargantext
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 159
    • Issues 159
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 8
    • Merge Requests 8
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • gargantext
  • haskell-gargantexthaskell-gargantext
  • Merge Requests
  • !338

Merged
Opened Sep 13, 2024 by Przemyslaw Kaminski@cgenie
  • Report abuse
Report abuse

Resolve "Switch from .ini to TOML?"

Related to #304 (closed)

This is a rewrite of our configuration to .toml format.

There is a gargantext-settings.toml_toModify file that you can use as a base template.

Also, there is a CLI subcommand to generate .toml file from your current ini file:

cabal v2-run gargantext-cli -- ini ./gargantext.ini

Tests were fixed accordingly.

Also, because I had problems with tests, I also fixed a long-standing dependency issue in cabal.project: no more allow-newer: *, allow-older: *! I managed to narrow down the dependencies to only the ones that are really required. I also fixed versions in gargantext.cabal file.

Because there are so many changes, it's good to merge this, especially that the tests do pass.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b 304-dev-toml-config-rewrite-and-update-deps origin/304-dev-toml-config-rewrite-and-update-deps

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/dev
git merge --no-ff 304-dev-toml-config-rewrite-and-update-deps

Step 4. Push the result of the merge to GitLab

git push origin dev

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 4
  • Commits 32
  • Pipelines 4
  • Changes 70
Assignee
Assign to
Epic 0.0.7
Milestone
Epic 0.0.7
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: gargantext/haskell-gargantext!338

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.