search

mattermost / desktop

Mattermost Desktop application for Windows, Mac and Linux
Apache License 2.0
1.97k stars 793 forks source link

[MM-58286] Fix cp_artifacts to avoid weird naming changes #3037

Closed devinbinnie closed 1 month ago

devinbinnie commented 1 month ago

Summary

Changes in the build process seem to constantly be breaking this script, which I believe was there to make sure we didn't include extra files. However, we now drop all of our artifacts into the same folder (tagged with the release version) so it's easier to just copy the folder.

Ticket Link

https://mattermost.atlassian.net/browse/MM-58286 Closes #3036

NONE
mattermost-build commented 1 month ago

Cherry pick is scheduled.

mattermost-build commented 1 month ago

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
From github.com:mattermost/desktop
   3cf7ec74..fed306e8  master       -> upstream/master
   a1f54308..f579ed34  release-5.8  -> upstream/release-5.8
 * [new tag]           v5.8.0       -> v5.8.0
 * [new tag]           v5.8.0-mas.1 -> v5.8.0-mas.1
 * [new tag]           v5.8.0-rc.3  -> v5.8.0-rc.3
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-desktop-#3037-upstream-release-5.8-1715892254
Switched to a new branch 'automated-cherry-pick-of-desktop-#3037-upstream-release-5.8-1715892254'
Branch 'automated-cherry-pick-of-desktop-#3037-upstream-release-5.8-1715892254' set up to track remote branch 'release-5.8' from 'upstream'.

+++ About to attempt cherry pick of PR #3037 with merge commit fed306e8bc2f604cc7fab88a251fca5d130f5f40.

Auto-merging scripts/cp_artifacts.sh
CONFLICT (content): Merge conflict in scripts/cp_artifacts.sh
error: could not apply fed306e8... [MM-58286] Fix cp_artifacts to avoid weird naming changes (#3037)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

+++ Conflicts detected:

UU scripts/cp_artifacts.sh
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.