Skip to content

Conversation

@scottfurry
Copy link
Contributor

During compiling of source, compiler will issue numerous warnings stating that SQLITE_HAS_CODEC is being redefined. Commit resolves this warning by placing a #ifndef pragma around declaration in header.

Also, minor format editing done to ensure good spacing to improve readability of pre-processor declarations.

During compiling of source, compiler will issue numerous warnings stating that `SQLITE_HAS_CODEC` is
being redefined. Commit resolves this warning by placing a ifndef pragma around declaration in header
@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

LGTM, and if there's nothing special about it, why not merge it? 😄

@justinclift
Copy link
Member

@lucydodo Are those CI failures due to GitHub flakiness, or are they something that needs looking at? 😄

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

@justinclift It looks like there was some kind of force push on the 'homebrew-core' tab.
So the brew update command doesn't work properly. To fix this, run brew update twice and it should work fine.
(Or untap and tap 'homebrew-core' again) I can temporaily fix the CI workflow if needed. 😄

@justinclift
Copy link
Member

k, doing it now...

@justinclift
Copy link
Member

Oh hang on, this isn't with our build infrastructure, it's with the GitHub Actions builders.

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

@justinclift
Copy link
Member

Scrolling to the bottom of that GitHub issue, they seem to think it's fixed.

Maybe we should let them know it's started up again?

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

I thought about that for a second, but then I saw below comment.

We continue to monitor in conjunction with GitHub.

so I figured they probably already knew that, and I didn't leave it. 😄

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

Additionally, I just created a branch with a commit that might fix this: https://github.com/sqlitebrowser/sqlitebrowser/tree/avoid-homebrew_issue
You can always merge it into the master branch if you need to.

@justinclift
Copy link
Member

You can always merge it into the master branch if you need to.

If you make a PR with it, then CI should automatically run with it for that PR. So we can see if it works... 😄

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

Even if I create a PR, will it not work based on the workflow in existing source tree?

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

Well, it looks like I was wrong. My apologies. Here's the PR: #3394

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

Screenshot 2023-07-02 at 21 16 50

Good news: The 'Install dependencies' job was successful as you can see. 😄

@justinclift
Copy link
Member

Cool. Lets see it run to completion, just in case. If it works fine, then we can merge that PR and rebase this one onto the updated master. That should then get the CI working for this PR too. 😄

@justinclift
Copy link
Member

Damn. It's still not happy. 😦

@justinclift
Copy link
Member

@lucydodo Hmmm, I'm going to leave this to you as I'm doing other stuff. 😉

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

Don't worry, Let me see if I can figure it out :)

During compiling of source, compiler will issue numerous warnings stating that `SQLITE_HAS_CODEC` is
being redefined. Commit resolves this warning by placing a ifndef pragma around declaration in header
@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

@justinclift It seems to be working fine now :)

@lucydodo lucydodo force-pushed the master branch 2 times, most recently from 4bc0c36 to e0a000c Compare July 2, 2023 13:12
@scottfurry
Copy link
Contributor Author

Original pull request doesn't appear to have been pulled into master.

@scottfurry scottfurry merged commit 1ef78cb into sqlitebrowser:master Jul 2, 2023
@scottfurry scottfurry deleted the CodecWarn branch July 2, 2023 22:04
@scottfurry
Copy link
Contributor Author

Commit merged into master. This was a little painful with CI issues confusing things. Hard for me to focus on one issue when unrelated things get piled on. A Me problem.

@lucydodo
Copy link
Member

lucydodo commented Jul 2, 2023

@scottfurry Did I do something wrong?

@scottfurry
Copy link
Contributor Author

@scottfurry Did I do something wrong?

The original commit was not pulled into master. Was it wrong? No. Just an oversight. I think everyone got hyper-focused on the CI problems that in fixing that the change for resolving the codec warning got lost somehow.

Not to get Too Philosophical on people, it's easy to lose sight of the hierarchy and orderliness of multiple git repositories/branches. I think that's what happened here. There was the master branch and the codec changes were in another branch. All the CI fixes got push from the changes branch into master. The original fix got left behind.

Easy fix. @lucydodo Don't beat yourself up.

@lucydodo
Copy link
Member

lucydodo commented Jul 3, 2023

Thanks for your kindness. 'Git' seems to be difficult no matter how much I learn and use it. 😄 😄

@scottfurry
Copy link
Contributor Author

Ah, grasshopper...when you can snatch the commit from my hand, then you will be ready.

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.

3 participants