Skip to content

Commit

Permalink
Modification to update stuff, 5-6 commits from full Template deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
Bioblaze committed Dec 2, 2024
1 parent 5edcf70 commit fd7d011
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 122 deletions.
6 changes: 3 additions & 3 deletions .github/actions/cerebro-download-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ runs:
shell: bash
run: |
# Parse the build_data JSON using fromJSON
build_data=$(echo "${{ steps.fetch_build.outputs.build_data }}" | jq -c '.')
completed_at=$(echo "$build_data" | jq -r '.completed_at')
file_url=$(echo "$build_data" | jq -r '.file_url')
build_data=$(echo '${{ steps.fetch_build.outputs.build_data }}' | jq -c '.')
completed_at=$(echo '$build_data' | jq -r '.completed_at')
file_url=$(echo '$build_data' | jq -r '.file_url')
echo "## Parsing Build Data" >> $GITHUB_STEP_SUMMARY
echo "Completed At: $completed_at" >> $GITHUB_STEP_SUMMARY
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

editor-check:
name: Checking Editor build.sha
if: ${{ github.event.client_payload.build_editors == true }}
if: contains(github.event.client_payload.build_type, 'editors')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile }}
Expand All @@ -74,7 +74,7 @@ jobs:

template-check:
name: Checking Templates build.sha
if: ${{ github.event.client_payload.build_templates == true }}
if: contains(github.event.client_payload.build_type, 'templates')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile == 'true' }}
Expand Down Expand Up @@ -170,6 +170,9 @@ jobs:
distribution: temurin
java-version: 17

- name: Setup Android SDK
uses: android-actions/setup-android@v3

- name: Restore Godot build cache
uses: ./.github/actions/godot-cache-restore
with:
Expand Down Expand Up @@ -375,7 +378,6 @@ jobs:
source: build.sha
out_dir: ${{ env.DEPLOY_TYPE }}/${{ github.event.client_payload.type || 'nightly' }}


build-templates:
runs-on: "ubuntu-20.04"
name: Building ${{ matrix.name }}
Expand Down Expand Up @@ -643,7 +645,6 @@ jobs:
cerebro_url: ${{ secrets.CEREBRO_URL }}
cerebro_auth: ${{ secrets.BLAZIUM_AUTH }}


template-success:
name: Template Success
needs: build-templates
Expand Down
27 changes: 5 additions & 22 deletions .github/workflows/deploy_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,34 +63,17 @@ jobs:

template-deploy:
name: 📊 Template Deploy
if: contains(github.event.client_payload.deploy, 'templates')
uses: ./.github/workflows/template_deploy.yml
secrets: inherit
with:
build_sha: ${{ inputs.build_sha }}
runner_id: ${{ inputs.runner_id }}

steam-deploy:
name: 🌐 Steam Deploy
needs: [template-deploy]
uses: ./.github/workflows/steam_deploy.yml
secrets: inherit
with:
build_sha: ${{ inputs.build_sha }}
runner_id: ${{ inputs.runner_id }}

play-deploy:
name: 🌐 Google Play Deploy
needs: [template-deploy]
uses: ./.github/workflows/play_deploy.yml
secrets: inherit
with:
build_sha: ${{ inputs.build_sha }}
runner_id: ${{ inputs.runner_id }}

apple-deploy:
name: 🌐 Apple Store Deploy
needs: [template-deploy]
uses: ./.github/workflows/apple_deploy.yml
editor-deploy:
name: 📊 Template Deploy
if: contains(github.event.client_payload.deploy, 'editors')
uses: ./.github/workflows/editor_deploy.yml
secrets: inherit
with:
build_sha: ${{ inputs.build_sha }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Apple Store Deploy
name: Eeditor Deploy
on:
workflow_call:
inputs:
Expand All @@ -16,15 +16,16 @@ env:
GODOT_BASE_BRANCH: blazium-dev

concurrency:
group: ci-${{github.actor}}-${{ github.event.client_payload.type || 'nightly' }}-apple-deploy
group: ci-${{github.actor}}-${{ github.event.client_payload.type || 'nightly' }}-editor-deploy
cancel-in-progress: true

jobs:
build-monoglue:
runs-on: "ubuntu-20.04"
name: Example for Apple Store Deploy
name: Example for Editor Deploy
steps:

- name: Testing
run: |
echo "Testing"
- name: Checkout Repository
uses: actions/checkout@v4
with:
repository: blazium-engine/ci_cd
submodules: recursive
2 changes: 1 addition & 1 deletion .github/workflows/ios_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

template-check:
name: Checking Templates build.sha
if: ${{ github.event.client_payload.build_templates == true }}
if: contains(github.event.client_payload.build_type, 'templates')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile == 'true' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

editor-check:
name: Checking Editor build.sha
if: ${{ github.event.client_payload.build_editors == true }}
if: contains(github.event.client_payload.build_type, 'editors')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile }}
Expand All @@ -69,7 +69,7 @@ jobs:

template-check:
name: Checking Templates build.sha
if: ${{ github.event.client_payload.build_templates == true }}
if: contains(github.event.client_payload.build_type, 'templates')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile == 'true' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

editor-check:
name: Checking Editor build.sha
if: ${{ github.event.client_payload.build_editors == true }}
if: contains(github.event.client_payload.build_type, 'editors')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile }}
Expand All @@ -66,7 +66,7 @@ jobs:

template-check:
name: Checking Templates build.sha
if: ${{ github.event.client_payload.build_templates == true }}
if: contains(github.event.client_payload.build_type, 'templates')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile == 'true' }}
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/play_deploy.yml

This file was deleted.

34 changes: 17 additions & 17 deletions .github/workflows/runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,17 @@ jobs:
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}

web-build:
name: 🌐 Web
needs: [get-latest-sha, static-checks]
if: contains(github.event.client_payload.build, 'web')
if: contains(github.event.client_payload.build, 'web') && !github.event.client_payload.run_id
uses: ./.github/workflows/web_builds.yml
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
new_major: ${{ needs.get-latest-sha.outputs.major }}
new_minor: ${{ needs.get-latest-sha.outputs.minor }}
new_patch: ${{ needs.get-latest-sha.outputs.patch }}
Expand All @@ -96,12 +96,12 @@ jobs:
monoglue-build:
name: Mono Glue
needs: [get-latest-sha, static-checks]
if: contains(github.event.client_payload.build, 'monoglue')
if: contains(github.event.client_payload.build, 'monoglue') && !github.event.client_payload.run_id
uses: ./.github/workflows/mono_glue_build.yml
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
new_major: ${{ needs.get-latest-sha.outputs.major }}
new_minor: ${{ needs.get-latest-sha.outputs.minor }}
new_patch: ${{ needs.get-latest-sha.outputs.patch }}
Expand All @@ -110,12 +110,12 @@ jobs:
android-build:
name: 🤖 Android
needs: [monoglue-build, get-latest-sha]
if: contains(github.event.client_payload.build, 'android')
if: contains(github.event.client_payload.build, 'android') && !github.event.client_payload.run_id
uses: ./.github/workflows/android_builds.yml
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
new_major: ${{ needs.get-latest-sha.outputs.major }}
new_minor: ${{ needs.get-latest-sha.outputs.minor }}
new_patch: ${{ needs.get-latest-sha.outputs.patch }}
Expand All @@ -124,12 +124,12 @@ jobs:
ios-build:
name: 🍏 iOS
needs: [monoglue-build, get-latest-sha]
if: contains(github.event.client_payload.build, 'ios')
if: contains(github.event.client_payload.build, 'ios') && !github.event.client_payload.run_id
uses: ./.github/workflows/ios_builds.yml
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
new_major: ${{ needs.get-latest-sha.outputs.major }}
new_minor: ${{ needs.get-latest-sha.outputs.minor }}
new_patch: ${{ needs.get-latest-sha.outputs.patch }}
Expand All @@ -138,12 +138,12 @@ jobs:
linux-build:
name: 🐧 Linux
needs: [monoglue-build, get-latest-sha]
if: contains(github.event.client_payload.build, 'linux')
if: contains(github.event.client_payload.build, 'linux') && !github.event.client_payload.run_id
uses: ./.github/workflows/linux_builds.yml
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
new_major: ${{ needs.get-latest-sha.outputs.major }}
new_minor: ${{ needs.get-latest-sha.outputs.minor }}
new_patch: ${{ needs.get-latest-sha.outputs.patch }}
Expand All @@ -152,12 +152,12 @@ jobs:
macos-build:
name: 🍎 macOS
needs: [monoglue-build, get-latest-sha]
if: contains(github.event.client_payload.build, 'macos')
if: contains(github.event.client_payload.build, 'macos') && !github.event.client_payload.run_id
uses: ./.github/workflows/macos_builds.yml
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
new_major: ${{ needs.get-latest-sha.outputs.major }}
new_minor: ${{ needs.get-latest-sha.outputs.minor }}
new_patch: ${{ needs.get-latest-sha.outputs.patch }}
Expand All @@ -166,12 +166,12 @@ jobs:
windows-build:
name: 🏁 Windows
needs: [monoglue-build, get-latest-sha]
if: contains(github.event.client_payload.build, 'windows')
if: contains(github.event.client_payload.build, 'windows') && !github.event.client_payload.run_id
uses: ./.github/workflows/windows_builds.yml
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
new_major: ${{ needs.get-latest-sha.outputs.major }}
new_minor: ${{ needs.get-latest-sha.outputs.minor }}
new_patch: ${{ needs.get-latest-sha.outputs.patch }}
Expand All @@ -185,7 +185,7 @@ jobs:
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
monoglue-build: ${{ needs.monoglue-build.result }}
windows-build: ${{ needs.windows-build.result }}
macos-build: ${{ needs.macos-build.result }}
Expand All @@ -206,7 +206,7 @@ jobs:
secrets: inherit
with:
build_sha: ${{ needs.get-latest-sha.outputs.build_sha }}
runner_id: ${{ github.run_id }}
runner_id: ${{ github.event.client_payload.run_id || github.run_id }}
monoglue-build: ${{ needs.monoglue-build.result }}
windows-build: ${{ needs.windows-build.result }}
macos-build: ${{ needs.macos-build.result }}
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/steam_deploy.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/web_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

editor-check:
name: Checking Editor build.sha
if: ${{ github.event.client_payload.build_editors == true }}
if: contains(github.event.client_payload.build_type, 'editors')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile }}
Expand All @@ -68,7 +68,7 @@ jobs:

template-check:
name: Checking Templates build.sha
if: ${{ github.event.client_payload.build_templates == true }}
if: contains(github.event.client_payload.build_type, 'templates')
runs-on: ubuntu-latest
outputs:
compile: ${{ steps.compile.outputs.should_compile == 'true' }}
Expand Down
Loading

0 comments on commit fd7d011

Please sign in to comment.