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.

Sign up for GitHub

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

Jump to bottom

Mac bundling #42

Merged
merged 31 commits into from
Jul 1, 2020
Merged

Mac bundling #42

merged 31 commits into from
Jul 1, 2020

Conversation

pega3
Copy link
Contributor

@pega3 pega3 commented Jun 30, 2020

Mac version is now delivered as an App and works without manually setting the execution bits. It also has a proper icon.

pega3 added 24 commits June 28, 2020 21:11
@pega3
Adding properties for bundle
ba45226
@pega3
Updating dependencies
0472af3
@pega3
Adding application icons
c13920f
@pega3
Adding bundling to github action
81ef18f
@pega3
Trying to install bundle command
7c505b6
@pega3
Merge branch 'master' into Mac_Bundling
9060883
@pega3
Trying to improve build process
0e7c879
@pega3
Update build.yaml
08fa85d
@pega3
Update build.yaml
c21a666
@pega3
Display directory data
b32696d
@pega3
Triggering new build
4119475
@pega3
Including stripping again
9c3600e
@pega3
remove superflous stuff
34babee
@pega3
Strip not working
60fc218
@pega3
Now the execution flags are lost again
9573692
@pega3
Trying to archive ourselves
010b8cb
@pega3
Double-zip instead of tar
522acba
@pega3
Fixing release
9a7cfd0
@pega3
Correcting release step
c750f56
@pega3
Merge remote-tracking branch 'upstream/master'
83d2935
@pega3
Update Cargo.lock
49db3c3
@pega3
Merge branch 'master' into Mac_Bundling
86946ee
@pega3
Added icon for Mac
2b38646
@pega3
Merge branch 'Mac_Bundling' of https://github.com/pega3/ESLauncher2 i…
c0c2aeb 
…nto Mac_Bundling
MCOfficer
MCOfficer requested changes Jun 30, 2020
View reviewed changes
Copy link
Member

@MCOfficer MCOfficer left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Wow, that's more than i expected! Well done, this is really coming together. I still have a couple things, but PR in general is sane.

Edit: you don't have to bother with the merge conflicts.

Cargo.toml Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
.github/workflows/build.yaml Outdated Show resolved Hide resolved
.github/workflows/build.yaml Show resolved Hide resolved
.github/workflows/build.yaml Show resolved Hide resolved
.github/workflows/build.yaml Show resolved Hide resolved
@MCOfficer MCOfficer added the enhancement New feature or request label Jun 30, 2020
@MCOfficer MCOfficer self-assigned this Jun 30, 2020
tehhowch
tehhowch reviewed Jul 1, 2020
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
Cargo.toml Outdated Show resolved Hide resolved
@MCOfficer MCOfficer mentioned this pull request Jul 1, 2020
Merged
@MCOfficer MCOfficer requested a review from tehhowch July 1, 2020 07:06
@tehhowch tehhowch removed their request for review July 1, 2020 11:22
@MCOfficer MCOfficer merged commit 23fcd69 into EndlessSkyCommunity:master Jul 1, 2020
@pega3 pega3 deleted the Mac_Bundling branch July 1, 2020 12:23
@MCOfficer MCOfficer mentioned this pull request Jul 3, 2020
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tehhowch tehhowch tehhowch left review comments

@MCOfficer MCOfficer MCOfficer approved these changes

Assignees

@MCOfficer MCOfficer

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pega3 @tehhowch @MCOfficer