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

Finally update the master branch #29

Merged
merged 32 commits into from
Dec 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
312ccd5
Update Engine to preview (Copy paste is back)
ChristopherHX Dec 18, 2019
e43d4eb
Update README.md
ChristopherHX Dec 19, 2019
08856ab
Test
ChristopherHX Dec 20, 2019
d2fd533
Fix launching from AmazonAppStore
ChristopherHX Dec 23, 2019
dc889ae
Added MacOs builder for 10.14 SDK
ChristopherHX Dec 23, 2019
fe225a8
Fix workflow syntax
ChristopherHX Dec 23, 2019
f138b53
Fix new MacOs builder
ChristopherHX Dec 23, 2019
d6aaa49
Fix: Gamepad Settings reappear
ChristopherHX Dec 27, 2019
95e76c3
Updated MacOs HiDpi Support
ChristopherHX Dec 28, 2019
7959a62
Upload current Releases to Release Page
ChristopherHX Dec 29, 2019
09707bb
MacOs Experiment
ChristopherHX Dec 29, 2019
1d15ac2
MacOs Experiment 2
ChristopherHX Dec 29, 2019
b7f11d4
MacOs Experiment 3
ChristopherHX Dec 29, 2019
fb4ec4c
MacOs Experiment 4
ChristopherHX Dec 29, 2019
61513c1
MacOs Experiment 5
ChristopherHX Dec 29, 2019
b63783f
MacOs Experiment 6
ChristopherHX Dec 29, 2019
19b1223
MacOs Experiment 7
ChristopherHX Dec 29, 2019
e7c0e37
Update main.yml
ChristopherHX Dec 29, 2019
60fd9ac
Update main.yml
ChristopherHX Dec 29, 2019
3e93737
Update main.yml
ChristopherHX Dec 29, 2019
c0b6b08
Update main.yml
ChristopherHX Dec 29, 2019
d5459f7
Update main.yml
ChristopherHX Dec 29, 2019
663d9c2
Test
ChristopherHX Dec 29, 2019
923bd5d
Update main.yml
ChristopherHX Dec 29, 2019
b943a51
Update main.yml
ChristopherHX Dec 29, 2019
c5afb4b
Update main.yml
ChristopherHX Dec 29, 2019
b2a0135
Update main.yml
ChristopherHX Dec 29, 2019
1de08bc
Update main.yml
ChristopherHX Dec 29, 2019
b0cce60
Update main.yml
ChristopherHX Dec 29, 2019
c92fa7d
Test
ChristopherHX Dec 29, 2019
9f3c736
MacOs Current
ChristopherHX Dec 29, 2019
d256c2e
Fix CI script
ChristopherHX Dec 29, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 95 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
name: CI

on: [push]

jobs:
build:

runs-on: macos-latest

steps:
- uses: actions/checkout@v1
with:
Expand All @@ -17,15 +13,32 @@ jobs:
repository: ChristopherHX/MacOSX10.13.sdk
ref: d4e62526638c82e8e62fef0de0ad767a1f798671
token: ${{ secrets.MacOSX1013sdk }}
- name: List files
working-directory: ${{ github.workspace }}
run: ls /Applications/Xcode*
- name: Update brew
run: brew update
- name: Apply custom patch and Update brew
working-directory: "/usr/local/Homebrew"
run: |
brew update
git remote add fork https://github.com/ChristopherHX/brew.git
git fetch fork
git config --global user.email "CI@local"
git config --global user.name "CI Bot"
git merge fork/master
- name: Install brew dependencies
run: brew install p7zip libpng libzip libuv protobuf
run: |
export HOMEBREW_MACOSX_DEPLOYMENT_TARGET=10.12.0
export HOMEBREW_SDKROOT=${{ github.workspace }}/../MacOSX10.13.sdk
brew install p7zip libzip libuv protobuf || :
- uses: actions/setup-python@v1
with:
python-version: '3.x' # Version range or exact version of a Python version to use, using semvers version range syntax.
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
- uses: actions/setup-python@v1
with:
python-version: '2.x' # Version range or exact version of a Python version to use, using semvers version range syntax.
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
- name: Show python versions
run: python --version && python2 --version && python3 --version
- name: Install python dependencies
run: pip3 install jinja2 ds_store
run: python3 -m pip install --upgrade pip && pip3 install jinja2 ds_store
- name: Download Qt
working-directory: ${{ github.workspace }}/../osx-packaging-scripts
run: ./download_qt.sh
Expand All @@ -35,11 +48,80 @@ jobs:
export MACOSX_DEPLOYMENT_TARGET=10.12
export SDKROOT=${{ github.workspace }}/../MacOSX10.13.sdk
python3 __main__.py --qt-path qt/*/*/

- name: Build .dmg
working-directory: ${{ github.workspace }}/../osx-packaging-scripts
run: python3 build_dmg.py
- uses: actions/upload-artifact@master
with:
name: DMG Image
name: DMG(sdk10.13)
path: ${{ github.workspace }}/../osx-packaging-scripts/output/Minecraft Bedrock Launcher.dmg
buildSDK_10_14:
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
with:
repository: ChristopherHX/osx-packaging-scripts
ref: buildfork
- uses: actions/checkout@v1
with:
repository: ChristopherHX/MacOSX10.14.sdk
ref: 5d1c9b28f01ef0b01225f92670ee587b430efa8e
token: ${{ secrets.MacOSX1013sdk }}
- name: Apply custom patch and Update brew
working-directory: "/usr/local/Homebrew"
run: |
brew update
git remote add fork https://github.com/ChristopherHX/brew.git
git fetch fork
git config --global user.email "CI@local"
git config --global user.name "CI Bot"
git merge fork/master
- name: Install brew dependencies
run: |
export HOMEBREW_MACOSX_DEPLOYMENT_TARGET=10.12.0
export HOMEBREW_SDKROOT=${{ github.workspace }}/../MacOSX10.14.sdk
brew install p7zip libzip libuv protobuf || :
- uses: actions/setup-python@v1
with:
python-version: '3.x' # Version range or exact version of a Python version to use, using semvers version range syntax.
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
- uses: actions/setup-python@v1
with:
python-version: '2.x' # Version range or exact version of a Python version to use, using semvers version range syntax.
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
- name: Show python versions
run: python --version && python2 --version && python3 --version
- name: Install python dependencies
run: python3 -m pip install --upgrade pip && pip3 install jinja2 ds_store
- name: Download Qt
working-directory: ${{ github.workspace }}/../osx-packaging-scripts
run: ./download_qt.sh
- name: Build
working-directory: ${{ github.workspace }}/../osx-packaging-scripts
run: |
export MACOSX_DEPLOYMENT_TARGET=10.12
export SDKROOT=${{ github.workspace }}/../MacOSX10.14.sdk
python3 __main__.py --qt-path qt/*/*/
- name: Build .dmg
working-directory: ${{ github.workspace }}/../osx-packaging-scripts
run: python3 build_dmg.py
- uses: actions/upload-artifact@master
with:
name: DMG(sdk10.14)
path: ${{ github.workspace }}/../osx-packaging-scripts/output/Minecraft Bedrock Launcher.dmg
uploadlatest:
runs-on: ubuntu-latest
needs: [build, buildSDK_10_14]
steps:
- name: Download sdk 10.13 Release
uses: actions/download-artifact@v1
with:
name: DMG(sdk10.13)
- name: Download sdk 10.14 Release
uses: actions/download-artifact@v1
with:
name: DMG(sdk10.14)
- name: Move to artifacts
run: mkdir -p artifacts && mv DMG\(sdk10.13\)/*.dmg ./artifacts/Minecraft_Bedrock_Launcher_FORK_sdk10.13.dmg && mv DMG\(sdk10.14\)/*.dmg ./artifacts/Minecraft_Bedrock_Launcher_FORK_sdk10.14.dmg
- name: Upload Latest
run: curl -L https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz --output ghr.tar.gz && tar -xf ghr.tar.gz && ./ghr*/ghr -t ${{ secrets.MacOSX1013sdk }} -u ChristopherHX -r mcpelauncher-manifest -delete -b "[First read my README](https://github.com/ChristopherHX/mcpelauncher-manifest) for current Features, known Issues / Bugs, Sourcecode or Linux Releases"$'\n'"**Only MacOs 10.12, 10.13 and 10.14 are supported**" MacOsLatest artifacts
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ A fork of MCPE Launcher created by ChristopherHX for the Linux and Mac OS Bedroc
- More prebuild Linux (disribution) packages supported than the original launcher

# Not Implemented yet
- copy / paste handling
- Autoupdate of the Launcher

# [Issues / Bugs](https://github.com/ChristopherHX/mcpelauncher-manifest/issues)
Expand Down
2 changes: 1 addition & 1 deletion game-window
2 changes: 1 addition & 1 deletion libjnivm
Submodule libjnivm updated 2 files
+148 −8 include/jnivm.h
+649 −504 src/jnivm.cpp
2 changes: 1 addition & 1 deletion mcpelauncher-server