Skip to content

Gordon/port to android #111

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

Draft
wants to merge 27 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8e17b48
split engine and deployment since GHA is not working from the other repo
RevoluPowered Apr 9, 2024
e1b92f0
add checkout step
RevoluPowered Apr 9, 2024
5abb990
fix work dir
RevoluPowered Apr 9, 2024
fe88e45
fix format for composite job
RevoluPowered Apr 9, 2024
2e79d78
fix caller
RevoluPowered Apr 9, 2024
ce32401
Fix environment
RevoluPowered Apr 10, 2024
96a4775
Fix upload path
RevoluPowered Apr 10, 2024
6486ea1
Exe fix
RevoluPowered Apr 10, 2024
a11f063
test
RevoluPowered Apr 10, 2024
33d1236
GH is nuking variable test fix
RevoluPowered Apr 10, 2024
16f649b
test
RevoluPowered Apr 10, 2024
c176b30
disable build until we're ready to enable other platforms
RevoluPowered Apr 10, 2024
dcaf32f
fix env bug
RevoluPowered Apr 10, 2024
a8faf3f
fix engine
RevoluPowered Apr 10, 2024
7d5298d
Enable all platform builds
RevoluPowered Apr 11, 2024
2105e49
fix syntax error
RevoluPowered Apr 11, 2024
9b984fe
Fix environment
RevoluPowered Apr 11, 2024
4f8a643
Fix linux
RevoluPowered Apr 11, 2024
a55cc95
PR and Dev builds should be a separate file for now.
RevoluPowered Apr 11, 2024
14f535b
stash
RevoluPowered Apr 13, 2024
44b66ed
fix cross compilation
RevoluPowered Apr 15, 2024
f0388ca
update to latest version - with jolt support
RevoluPowered Apr 15, 2024
4e28b66
Add vscode files so I can work on any machine with ease.
RevoluPowered Apr 15, 2024
53b67e4
add non universal args for packaging android template...
RevoluPowered Apr 15, 2024
384bc4d
android working
RevoluPowered Apr 15, 2024
c9eafe9
fix compile script for both builds of android
RevoluPowered Apr 17, 2024
73d98f2
add android support for xr
RevoluPowered Apr 17, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
environment: dev
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_SECRET_WRITE_TOKEN }}

Expand Down
27 changes: 11 additions & 16 deletions .github/workflows/client-build-tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ on:
custom-project-file:
required: false
type: string
editor-download-url:
required: true
type: string
template-download-url:
required: true
type: string
outputs:
url:
value: ${{ jobs.client-build-tool.outputs.url }}
Expand All @@ -105,7 +111,7 @@ on:
value: ${{ jobs.client-build-tool.outputs.version }}
secrets:
gcp-secret:
required: false
required: true
cicd-token-github:
required: true
ITCH_IO_CICD:
Expand Down Expand Up @@ -158,27 +164,16 @@ jobs:
rm -Rf project.godot
mv ${{ inputs.custom-project-file }} project.godot

- name: Download editor artifact
uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{ secrets.cicd-token-github }}
workflow: ${{ inputs.editor-binary-workflow }}
workflow_conclusion: "in_progress"
name: ${{ inputs.editor-binary-download }}
- name: Download editor and template
run: |
curl ${{ inputs.editor-download-url }} > ${{ inputs.editor-binary-download }}
curl ${{ inputs.template-download-url }} > ${{ inputs.template-binary-name }}

- name: Unzip editor binary
if: ${{ inputs.should-unzip-editor }}
run: |
unzip -o ${{ inputs.editor-binary-download }}

- name: Download export template artifact
uses: dawidd6/action-download-artifact@v3
with:
github_token: ${{ secrets.cicd-token-github }}
workflow: ${{ inputs.template-binary-workflow }}
workflow_conclusion: "in_progress" # must be in_progress otherwise we can't find them for our current job
name: ${{ inputs.template-binary-name }}

- name: Set up template in system-wide editor data
run: |
chmod +x ./${{ inputs.template-binary-name }}
Expand Down
98 changes: 98 additions & 0 deletions .github/workflows/deployment-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
name: PR Deployment
on:
pull_request:
paths:
- godot-engine/**
- .github/**
- mirror-godot-app/**

concurrency:
# workflow name - PR || fallback to unique run id, this happens when you're not building a PR
# this ensures all branches build properly and cancel their previous runs
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build-windows-client:
name: 🏁 Build Windows Dev PR
uses: ./.github/workflows/client-build-tool.yml
secrets:
gcp-secret: ""
cicd-token-github: ${{ secrets.GITHUB_TOKEN }}
with:
should-deploy: false
should-run-unit-tests: true
should-notify-on-failure: false
editor-binary-workflow: deployment.yml
editor-binary-name: MirrorGodotEditorWindows.exe
editor-binary-download: MirrorGodotEditorWindows.exe
editor-binary-branch: dev
editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.dev
template-binary-workflow: deployment.yml
template-binary-name: windows_release_x86_64.exe
template-binary-branch: themirror
export-template-file: windows_release_x86_64.exe
game-environment-cfg-name: official
game-export-preset: Windows
game-binary-name: The Mirror Dev.exe
bucket-name: no-bucket
os: "windows-latest"
# TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side.
editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/4309e8e8/MirrorGodotEditorWindows.exe
template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/4309e8e8/windows_release_x86_64.exe
build-macos-client:
name: 🍎 Build MacOS Dev PR
uses: ./.github/workflows/client-build-tool.yml
secrets:
gcp-secret: ""
cicd-token-github: ${{ secrets.GITHUB_TOKEN }}
with:
should-deploy: false
should-run-unit-tests: true
should-notify-on-failure: false
should-unzip-editor: true
should-install-timeout-macos: true
editor-binary-workflow: deployment.yml
editor-binary-download: MirrorGodotEditorMac.app.zip
editor-binary-name: MirrorGodotEditorMac.app/Contents/MacOS/Godot
editor-binary-branch: themirror
editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.dev
template-binary-workflow: deployment.yml
template-binary-name: macos_template.app.zip
template-binary-branch: dev
export-template-file: macos.zip
game-environment-cfg-name: official
game-export-preset: MacOS-themirror-dev
game-binary-name: The Mirror Dev.app
bucket-name: no-bucket
os: "macos-latest"
# TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side.
editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/4309e8e8/MirrorGodotEditorMac.app.zip
template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/4309e8e8/macos_template.app.zip
build-linux-client:
name: 🐧 Build Linux Dev PR
uses: ./.github/workflows/client-build-tool.yml
secrets:
gcp-secret: ""
cicd-token-github: ${{ secrets.GITHUB_TOKEN }}
with:
should-deploy: false
should-run-unit-tests: true
should-notify-on-failure: false
editor-binary-workflow: deployment.yml
editor-binary-name: MirrorGodotEditorLinux.x86_64
editor-binary-download: MirrorGodotEditorLinux.x86_64
editor-binary-branch: dev
editor-template-directory: ~/.local/share/godot/export_templates/4.3.dev
template-binary-workflow: deployment.yml
template-binary-name: linux_release.x86_64
template-binary-branch: themirror
export-template-file: linux_release.x86_64
game-environment-cfg-name: official
game-export-preset: Linux
game-binary-name: The Mirror Dev.x86_64
bucket-name: no-bucket
os: "ubuntu-20.04"
# TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side.
editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/4309e8e8/MirrorGodotEditorLinux.x86_64
template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/4309e8e8/linux_release.x86_64
Loading
Loading