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

added air toml with paths for windows #90

Open
wants to merge 7 commits into
base: main
Choose a base branch
from

Conversation

andrenormanlang
Copy link

No description provided.

Copy link

codecov bot commented Jun 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 38.95%. Comparing base (86f0ef8) to head (00e0f16).
Report is 9 commits behind head on main.

Current head 00e0f16 differs from pull request most recent head 4eda4de

Please upload reports for the commit 4eda4de to get more accurate results.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #90      +/-   ##
==========================================
- Coverage   43.42%   38.95%   -4.47%     
==========================================
  Files          16       15       -1     
  Lines         760      706      -54     
==========================================
- Hits          330      275      -55     
- Misses        386      399      +13     
+ Partials       44       32      -12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Owner

@matheusgomes28 matheusgomes28 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution, the main points are:

  • rename air_windows.toml -> .air_windows.toml
  • remove the Makefile Windows file, not needed afaik
  • remove the urchin_windows_config.toml, you can use the urchin_config.toml int he repo unless I missed something

air_windows.toml Outdated
@@ -0,0 +1,46 @@
root = "."
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's rename this file to .air_windows.toml - Keeps it hidden for the linux guys

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You renamed the file and pushed the new name, but this is still here! You can push the "removed" file from git, it should appear as deleted when you do a git status - just do git add .ait_windows.toml after the deletion, and the commit it after that.

Makefile Windows Outdated
@@ -0,0 +1,34 @@
# Go parameters
GOCMD=go
TEMPL=templ
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file isn't necessary on windows, Makefile isn't usually standard on windows, as long as the .air_windows.toml file is right, we shouldn't need this one 😄

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TL;DR let's remove this from the PR

@@ -0,0 +1,41 @@
# Address to the MariaDB database
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to have any windows-only changes from the urchin_config.toml file - do we need this? If not, we can also remove from PR

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows reads the config.toml only as a .exe in order to run Air. =)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're mistaken here, this file is running from urchin so as long as --config urchin_config.toml is passed to urchin you should be fine. That's why I don't think we need this here.

For example, in your .air_windows.toml you just need

full_bin = ".\\tmp\\urchin.exe --config urchin_config.toml"

Copy link
Owner

@matheusgomes28 matheusgomes28 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay, I'm not at home but I had some time to look at this PR again. Left some suggestions

@@ -0,0 +1,41 @@
# Address to the MariaDB database
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're mistaken here, this file is running from urchin so as long as --config urchin_config.toml is passed to urchin you should be fine. That's why I don't think we need this here.

For example, in your .air_windows.toml you just need

full_bin = ".\\tmp\\urchin.exe --config urchin_config.toml"

```

This will start Urchin on `http://localhost:8080`. You can customize
This will start CMS FOR GO on `http://localhost:8080`. You can customize
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to push these changes to the PR? I think these shouldn't be here

air_windows.toml Outdated
@@ -0,0 +1,46 @@
root = "."
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You renamed the file and pushed the new name, but this is still here! You can push the "removed" file from git, it should appear as deleted when you do a git status - just do git add .ait_windows.toml after the deletion, and the commit it after that.

Makefile Windows Outdated
@@ -6,7 +6,7 @@ URCHIN_DIR=./cmd/urchin
URCHIN_ADMIN_DIR=./cmd/urchin-admin

# Name of the binary
BINARY_NAME=urchin
BINARY_NAME=urchin.exe
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still don't think we need this Makefile Windows file - the windows .air_windows.toml file doesn't reference it at all.

@@ -3,10 +3,10 @@ testdata_dir = "testdata"
tmp_dir = "tmp"

[build]
cmd = "make build"
cmd = "go build -v -o .\\tmp\\urchin.exe .\\cmd\\urchin"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you pushed this as a mistake too

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants