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

Matomo upgrade to 5.x #324

Merged

Conversation

g7morris
Copy link
Contributor

No description provided.

@g7morris g7morris self-assigned this Jan 26, 2024
@nigelgbanks
Copy link
Contributor

Screenshot 2024-01-28 at 18 48 40

Initial local test ran into this, I'll have a look a bit later when I get more time to see what's up with that.

@nigelgbanks nigelgbanks self-assigned this Jan 28, 2024
@g7morris
Copy link
Contributor Author

Interesting @nigelgbanks, Thanks for looking into that.

I can report that the upgrade steps from a running 4.x version to this one were...well...a lot.

Here is a summary of the steps taken with outcomes. Dashboard and functions looks good but still some warnings.

https://gist.github.com/g7morris/67cdfea1db1b6b47de76fedeea89d80a

@nigelgbanks
Copy link
Contributor

@g7morris the issue I had was with a clean installation. I've pushed a fix and raised a pull request against your organization's repository. Born-Digital-US#4

No worries about this pull request, but if you could in the future create branches in this repo, that would be ideal. As then the CI system with automated tests will run, and be visible in the pull request.

Cheers

Need to set the trusted host in latest version of Matomo.
@g7morris
Copy link
Contributor Author

Hi @nigelgbanks

Thanks for the updates.

Just to clarify this process should now be the following?

  • Sync our bd fork from upstream
  • create a feature branch on bd repo
    • dev and test, add changes etc
  • create feature branch on upstream buildkit repo with no changes checked out from main
  • create PR from bd feature branch to upstream buidkit feature branch which would have the intended changes
    • merge for tests?
  • create new PR from upstream feature branch to upstream main branch?

@g7morris
Copy link
Contributor Author

Perhaps we should make a section in the README.md to this effect e.g. Contributing etc that details the way committers and contributors should approach this?

My apologies for the confusion, I'm just reviewing other previous PRs and am not totally clear on how any of us are following the house rules. Sorry to track mud on the carpet, I promise I can learn and behave. ;)

@g7morris
Copy link
Contributor Author

So other than this fix that I've now merged, is this ready to be merged?

@nigelgbanks nigelgbanks merged commit 628627e into Islandora-Devops:main Jan 30, 2024
@nigelgbanks
Copy link
Contributor

Just to clarify this process should now be the following?

Oh I wouldn't worry about creating a fork and doing work there. You can just create a branch on this repo and do your work here. At least then it will be visible and prevent others from working on the same thing. Also the pull requests, etc. will be on the CI system and so it will validate changes.

Though you can do as you please, there is no hard requirement here. I just think it would be easier and more open not to do work in isolation.

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