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

Removing unused macro to avoid naming clashes #2305

Merged
merged 1 commit into from
Nov 4, 2021
Merged

Removing unused macro to avoid naming clashes #2305

merged 1 commit into from
Nov 4, 2021

Conversation

Foxei
Copy link
Contributor

@Foxei Foxei commented Nov 3, 2021

As discussed in issue #1997 this macro was clashing with function from the Gtk3 UI library. As it is not needed it was proposed by MiguelCompany to remove it.

Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

The code change is fine, but please fix DCO following the instructions here

@MiguelCompany MiguelCompany added no-aarch Skip build & test for aarch64 no-test Skip CI tests if PR marked with this label labels Nov 3, 2021
@MiguelCompany MiguelCompany linked an issue Nov 3, 2021 that may be closed by this pull request
As discussed in issue #1997 this macro was clashing with function from the Gtk3 UI library. As it is not needed it was proposed by MiguelCompany to remove it.

Signed-off-by: Simon Schaefer <simon.schaefer@rwth-aachen.de>
@Foxei
Copy link
Contributor Author

Foxei commented Nov 3, 2021

I think something in the Mac script is broken. Somehow it doesn't reach one of your internal repos.

Traceback (most recent call last):
  File "buildcop.py", line 422, in <module>
    main()
  File "buildcop.py", line 270, in main
    repo = git.Repo.clone_from(
  File "/usr/local/lib/python3.8/site-packages/git/repo/base.py", line 1032, in clone_from
    return cls._clone(git, url, to_path, GitCmdObjectDB, progress, multi_options, **kwargs)
  File "/usr/local/lib/python3.8/site-packages/git/repo/base.py", line 973, in _clone
    finalize_process(proc, stderr=stderr)
  File "/usr/local/lib/python3.8/site-packages/git/util.py", line 329, in finalize_process
    proc.wait(**kwargs)
  File "/usr/local/lib/python3.8/site-packages/git/cmd.py", line 408, in wait
    raise GitCommandError(self.args, status, errstr)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git clone --config=http.sslVerify=false -v https://gitlab.intranet.eprosima.com/eProsima/fastrtps-ci.git ci-repo
  stderr: 'Cloning into 'ci-repo'...
fatal: unable to access 'https://gitlab.intranet.eprosima.com/eProsima/fastrtps-ci.git/': Couldn't connect to server
'

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany
Copy link
Member

I think something in the Mac script is broken

It happens from time to time. I relaunched the CI

@MiguelCompany
Copy link
Member

Everything went ok. Thank you @Foxei for your contribution!

@MiguelCompany MiguelCompany merged commit 5fc0d6c into eProsima:master Nov 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-aarch Skip build & test for aarch64 no-test Skip CI tests if PR marked with this label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Naming clash generated by a macro define in the XML parser
2 participants