* Bump github.com/mattermost/mattermost-server/v6 in /dependabot
Bumps [github.com/mattermost/mattermost-server/v6](https://github.com/mattermost/mattermost-server) from 6.2.1 to 6.3.0.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v6.2.1...v6.3.0)
---
updated-dependencies:
- dependency-name: github.com/mattermost/mattermost-server/v6
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Add python2 dependency
Apparently something in 6.3.0 is using python2 for the first time?
* Use node v15 by default
We are now getting this error when building:
/build/.node-gyp/16.13.2/include/node/v8-internal.h:492:38: error: 'remove_cv_t' is not a member of 'std'
which the internet suggests is a problem with node 16 and node-sass. According to https://stackoverflow.com/questions/67241196/error-no-template-named-remove-cv-t-in-namespace-std-did-you-mean-remove , supposedly newer versions of node-sass support node 16, and the other solution is to pass -std=c++14 instead of c++0x (which is what is being done right now), but I can't say for sure whether this build script will work with CXXFLAGS or not. The other fix would seem to be to update node-sass to a version that supports node16, but that would presumably be more patching of files, this time in mattermost-webapp, so I'm trying the least-invasive option first.
* Update release.mk patch
* Update how we retrieve the Mattermost version
With mmctl in the require list in the go.mod, mattermost-server no longer appears on the same line as the require statement, so splitting by spaces means we now need the second split entry instead of the third.
We could also fix this by removing mmctl from the go.mod, which I was going to do, but that means every Dependabot update would no longer work. So going forward we will need to ensure that the go.mod always has the mattermost-server require on its own line instead of inline with the require statement.
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>
* Update for Mattermost v6
* Update release.mk patch
The Mattermost build script has changed to accomplish most of what we
were trying to patch it to support. The config generator is still a
point of contention, and I'm having trouble getting it to work even with
this patch, but wanted to toss it to the build machine to see if it
works there. We may need to dig into the config generator deeper if it
doesn't.
There are additional build script changes after 6.0 that have, for
example, linux-arm64 support already baked in, so we will eventually
need to make larger changes to which platforms we build at all.
* Bump github.com/mattermost/mattermost-server/v5 in /dependabot
Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.35.2 to 5.36.0.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.35.2...v5.36.0)
---
updated-dependencies:
- dependency-name: github.com/mattermost/mattermost-server/v5
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix dependabot auto-updates and update to 5.36.0 correctly
* Move config-reset to its own step
config-reset now (as of 5.36.0) is generated through a `go run` command.
If we pass the usual GOOS/GOARCH combo to this command, it will build
and then try to run an executable that's in a format different from the
host system, which can't succeed. This `go run`s config-reset as a
binary compatible with the host machine, then runs the full build with
the appropriate os/arch combo. All config-reset does is generate a new
config.json for the install anyway.
This make step was refactored in 3681cd3688
* More tweaks to handle new config stuff
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>
* Update to Mattermost 5.28.1
* Update release.mk patch for 5.28
* Repair to original patch text
* Run patch in batch mode
* Try to fix patch file
I'm having a hard time understanding why this is not working on CI.
* Working 5.28.1 release.mk patch
I was previously working off mattermost-server HEAD's copy of release.mk which has apparently changed since 5.28.1, so future PRs will need to make more changes to this patch. But for now, this should allow the patch to be applied.
