From 00da1fb6b51ca4e85a649fc2b200271b42ea3e4c Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 13:34:56 +0000 Subject: [PATCH 01/21] feat: added game export-config --- game-source/export_presets.cfg | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 game-source/export_presets.cfg diff --git a/game-source/export_presets.cfg b/game-source/export_presets.cfg new file mode 100644 index 0000000..0078c93 --- /dev/null +++ b/game-source/export_presets.cfg @@ -0,0 +1,37 @@ +[preset.0] + +name="Web" +platform="Web" +runnable=true +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false + +[preset.0.options] + +custom_template/debug="" +custom_template/release="" +variant/extensions_support=false +vram_texture_compression/for_desktop=true +vram_texture_compression/for_mobile=true +html/export_icon=true +html/custom_html_shell="" +html/head_include="" +html/canvas_resize_policy=2 +html/focus_canvas_on_start=true +html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color(0, 0, 0, 1) From 242275271569531198e6e27ae2d07716b0b6cacf Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 14:47:43 +0000 Subject: [PATCH 02/21] feat: added github action for building client --- .github/workflows/build-game-client.yml | 34 +++++++++++++++ client.Dockerfile | 58 +++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 .github/workflows/build-game-client.yml create mode 100644 client.Dockerfile diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml new file mode 100644 index 0000000..f22e5c7 --- /dev/null +++ b/.github/workflows/build-game-client.yml @@ -0,0 +1,34 @@ +name: "Build CosmicKube game client" +on: push + +env: + GODOT_VERSION: 4.2.1 + EXPORT_NAME: CosmicKube + PROJECT_PATH: game-source + +jobs: + export-web: + name: "Export for Web" + runs-on: ubuntu-20.04 + container: + image: barichello/godot-ci:4.2.1 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + lfs: true + - name: Setup + run: | + mkdir -v -p ~/.local/share/godot/export_templates/ + mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + - name: Windows Build + run: | + mkdir -v -p build/web + cd $PROJECT_PATH + godot --headless --verbose --export-release "Web" ../build/web/index.html + - name: Upload Artifact + uses: actions/upload-artifact@v1 + with: + name: web + path: build/web + \ No newline at end of file diff --git a/client.Dockerfile b/client.Dockerfile new file mode 100644 index 0000000..61f558e --- /dev/null +++ b/client.Dockerfile @@ -0,0 +1,58 @@ +FROM ubuntu:jammy +LABEL author="https://github.com/aBARICHELLO/godot-ci/graphs/contributors" + +USER root +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + git \ + git-lfs \ + unzip \ + wget \ + zip \ + adb \ + openjdk-17-jdk-headless \ + rsync \ + && rm -rf /var/lib/apt/lists/* + +ARG GODOT_VERSION="4.2.1" +ARG RELEASE_NAME="stable" +ARG SUBDIR="" +ARG GODOT_TEST_ARGS="" +ARG GODOT_PLATFORM="linux.x86_64" + +RUN wget https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}${SUBDIR}/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_${GODOT_PLATFORM}.zip \ + && wget https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}${SUBDIR}/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_export_templates.tpz \ + && mkdir ~/.cache \ + && mkdir -p ~/.config/godot \ + && mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${RELEASE_NAME} \ + && unzip Godot_v${GODOT_VERSION}-${RELEASE_NAME}_${GODOT_PLATFORM}.zip \ + && mv Godot_v${GODOT_VERSION}-${RELEASE_NAME}_${GODOT_PLATFORM} /usr/local/bin/godot \ + && unzip Godot_v${GODOT_VERSION}-${RELEASE_NAME}_export_templates.tpz \ + && mv templates/* ~/.local/share/godot/export_templates/${GODOT_VERSION}.${RELEASE_NAME} \ + && rm -f Godot_v${GODOT_VERSION}-${RELEASE_NAME}_export_templates.tpz Godot_v${GODOT_VERSION}-${RELEASE_NAME}_${GODOT_PLATFORM}.zip + +# Download and setup android-sdk +ENV ANDROID_HOME="/usr/lib/android-sdk" +RUN wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip \ + && unzip commandlinetools-linux-*_latest.zip -d cmdline-tools \ + && mv cmdline-tools $ANDROID_HOME/ \ + && rm -f commandlinetools-linux-*_latest.zip + +ENV PATH="${ANDROID_HOME}/cmdline-tools/cmdline-tools/bin:${PATH}" + +RUN yes | sdkmanager --licenses \ + && sdkmanager "platform-tools" "build-tools;33.0.2" "platforms;android-33" "cmdline-tools;latest" "cmake;3.22.1" "ndk;25.2.9519653" + +# Adding android keystore and settings +RUN keytool -keyalg RSA -genkeypair -alias androiddebugkey -keypass android -keystore debug.keystore -storepass android -dname "CN=Android Debug,O=Android,C=US" -validity 9999 \ + && mv debug.keystore /root/debug.keystore + +RUN godot -v -e --quit --headless ${GODOT_TEST_ARGS} +RUN echo 'export/android/android_sdk_path = "/usr/lib/android-sdk"' >> ~/.config/godot/editor_settings-4.tres +RUN echo 'export/android/debug_keystore = "/root/debug.keystore"' >> ~/.config/godot/editor_settings-4.tres +RUN echo 'export/android/debug_keystore_user = "androiddebugkey"' >> ~/.config/godot/editor_settings-4.tres +RUN echo 'export/android/debug_keystore_pass = "android"' >> ~/.config/godot/editor_settings-4.tres +RUN echo 'export/android/force_system_user = false' >> ~/.config/godot/editor_settings-4.tres +RUN echo 'export/android/timestamping_authority_url = ""' >> ~/.config/godot/editor_settings-4.tres +RUN echo 'export/android/shutdown_adb_on_exit = true' >> ~/.config/godot/editor_settings-4.tres \ No newline at end of file From 77f4cf19fbe1d392a4aa4c60073bd693f4d6970b Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:11:08 +0000 Subject: [PATCH 03/21] feat: added step to check if build succeeded --- .github/workflows/build-game-client.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index f22e5c7..abb11fe 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -21,11 +21,16 @@ jobs: run: | mkdir -v -p ~/.local/share/godot/export_templates/ mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - - name: Windows Build + - name: Web Build run: | mkdir -v -p build/web cd $PROJECT_PATH - godot --headless --verbose --export-release "Web" ../build/web/index.html + godot --headless --verbose --export-release "Web" ../build/web/index.html &> output.txt + - name: Check if build succeeded + run: | + if search="$(cat output.txt | grep 'ERROR:')" + then + exit 1 - name: Upload Artifact uses: actions/upload-artifact@v1 with: From beb19d045b54f919e310fd29d437445a8e07720e Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:12:25 +0000 Subject: [PATCH 04/21] chore: use etc2_astc compression --- game-source/project.godot | 1 + 1 file changed, 1 insertion(+) diff --git a/game-source/project.godot b/game-source/project.godot index f937ed2..d64f5ba 100644 --- a/game-source/project.godot +++ b/game-source/project.godot @@ -19,3 +19,4 @@ config/icon="res://icon.svg" renderer/rendering_method="gl_compatibility" renderer/rendering_method.mobile="gl_compatibility" +textures/vram_compression/import_etc2_astc=true From e06f8c531ed4ea623cbe6a4e380952afd6beb9ed Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:16:13 +0000 Subject: [PATCH 05/21] fix: whoops --- .github/workflows/build-game-client.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index abb11fe..cfdfc9d 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -28,9 +28,12 @@ jobs: godot --headless --verbose --export-release "Web" ../build/web/index.html &> output.txt - name: Check if build succeeded run: | + echo Reading build logs... + cat output.txt if search="$(cat output.txt | grep 'ERROR:')" then exit 1 + fi ;; - name: Upload Artifact uses: actions/upload-artifact@v1 with: From 26cdf8a5ed7353b89239088dd5bcd71f323c9478 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:19:15 +0000 Subject: [PATCH 06/21] fix: whoops 2 --- .github/workflows/build-game-client.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index cfdfc9d..6b6c89a 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -29,6 +29,7 @@ jobs: - name: Check if build succeeded run: | echo Reading build logs... + cd $PROJECT_PATH cat output.txt if search="$(cat output.txt | grep 'ERROR:')" then From a191f03c8483908380ba8eadf5e7e97b6b62a44c Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:21:15 +0000 Subject: [PATCH 07/21] fix: whoops 3 --- .github/workflows/build-game-client.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 6b6c89a..5ad3033 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -34,7 +34,9 @@ jobs: if search="$(cat output.txt | grep 'ERROR:')" then exit 1 - fi ;; + else + exit 0 + fi ; - name: Upload Artifact uses: actions/upload-artifact@v1 with: From 60cf2ea5384504d1f694e1824c9d20f01d75f621 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:26:56 +0000 Subject: [PATCH 08/21] chore: sanity check --- .github/workflows/build-game-client.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 5ad3033..ecd3237 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -25,18 +25,7 @@ jobs: run: | mkdir -v -p build/web cd $PROJECT_PATH - godot --headless --verbose --export-release "Web" ../build/web/index.html &> output.txt - - name: Check if build succeeded - run: | - echo Reading build logs... - cd $PROJECT_PATH - cat output.txt - if search="$(cat output.txt | grep 'ERROR:')" - then - exit 1 - else - exit 0 - fi ; + godot --headless --verbose --export-release "Web" ../build/web/index.html - name: Upload Artifact uses: actions/upload-artifact@v1 with: From 30eece795ed541b00cb9c4bf2302d34d583af6d5 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:29:38 +0000 Subject: [PATCH 09/21] chroe: aaaaaaaaaaaaa --- .github/workflows/build-game-client.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index ecd3237..94a052d 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -25,7 +25,15 @@ jobs: run: | mkdir -v -p build/web cd $PROJECT_PATH - godot --headless --verbose --export-release "Web" ../build/web/index.html + godot --headless --verbose --export-release "Web" ../build/web/index.html &> output.txt + echo Reading build logs... + cat output.txt + if search="$(cat output.txt | grep 'ERROR:')" + then + exit 1 + else + exit 0 + fi ; - name: Upload Artifact uses: actions/upload-artifact@v1 with: From c8018820f73e4b6a355844926878d29d43cda553 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:36:53 +0000 Subject: [PATCH 10/21] fsgrfdgsf --- .github/workflows/build-game-client.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 94a052d..5605d0c 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -25,13 +25,14 @@ jobs: run: | mkdir -v -p build/web cd $PROJECT_PATH - godot --headless --verbose --export-release "Web" ../build/web/index.html &> output.txt + godot --headless --verbose --export-release "Web" ../build/web/index.html 2>&1 | tee output.txt echo Reading build logs... - cat output.txt if search="$(cat output.txt | grep 'ERROR:')" then + echo "Build failed!" exit 1 else + echo "Build succeeded!" exit 0 fi ; - name: Upload Artifact From b742477df98e329494bae0c39a6c41a85b981f78 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:39:00 +0000 Subject: [PATCH 11/21] don't wanna fail on EVERY error --- .github/workflows/build-game-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 5605d0c..6666dea 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -27,7 +27,7 @@ jobs: cd $PROJECT_PATH godot --headless --verbose --export-release "Web" ../build/web/index.html 2>&1 | tee output.txt echo Reading build logs... - if search="$(cat output.txt | grep 'ERROR:')" + if search="$(cat output.txt | grep 'ERROR: Project export')" then echo "Build failed!" exit 1 From f1267cb40ab620530a87a0967b1600ef3f305d0c Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:42:21 +0000 Subject: [PATCH 12/21] chore: bumped checkout to v4 --- .github/workflows/build-game-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 6666dea..5e69443 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -14,7 +14,7 @@ jobs: image: barichello/godot-ci:4.2.1 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - name: Setup From 70577b0b348a4febd1d970441203bb4ceea469bb Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:48:37 +0000 Subject: [PATCH 13/21] feat: mirrored actions file to Jenkinsfile --- Jenkinsfile | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 51f57d7..5076dab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,24 +1,38 @@ pipeline { - agent any + agent { + docker { + image 'barichello/godot-ci:4.2.1' + + } } + environment { + GODOT_VERSION = '4.2.1' + EXPORT_NAME = 'CosmicKube' + PROJECT_PATH = 'game-source' + } stages { - stage('Hello world') { + stage('Setup') { steps { - sh 'echo pee pee' + sh '''mkdir -v -p ~/.local/share/godot/export_templates/ + mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + ''' + } + } + stage('Web Build') { + steps { + sh '''mkdir -v -p build/web + cd $PROJECT_PATH + godot --headless --verbose --export-release "Web" ../build/web/index.html 2>&1 | tee output.txt + echo Reading build logs... + if search="$(cat output.txt | grep 'ERROR: Project export')" + then + echo "Build failed!" + exit 1 + else + echo "Build succeeded!" + exit 0 + fi ;''' } } - - // stage('Push image') { - // steps { - // sh 'docker push localhost:5000/ttt' - // } - // } - // - // stage('Package') { - // steps { - // sh 'helm install ttt ttt | true' - // sh 'helm upgrade ttt ttt' - // } - // } } -} +} \ No newline at end of file From acfe1e17c9135bde603d63db2212be35a2e06a50 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:48:50 +0000 Subject: [PATCH 14/21] feat: added flow to test Jenkinsfile --- .github/workflows/test-jenkinsfile.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/test-jenkinsfile.yml diff --git a/.github/workflows/test-jenkinsfile.yml b/.github/workflows/test-jenkinsfile.yml new file mode 100644 index 0000000..90f87eb --- /dev/null +++ b/.github/workflows/test-jenkinsfile.yml @@ -0,0 +1,18 @@ +name: "Build CosmicKube game client" +on: push + +env: + GODOT_VERSION: 4.2.1 + EXPORT_NAME: CosmicKube + PROJECT_PATH: game-source + +jobs: + test-jenkins: + name: "Test Jenkinsfile" + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@master + - name: jenkinsfile-runner-prepackaged + uses: jenkinsci/jenkinsfile-runner-github-actions/jenkinsfile-runner-prepackaged@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 5dfc76f2731b3bb22dc8a59cd57f00ac8bdb6da6 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:50:58 +0000 Subject: [PATCH 15/21] chore: make jenkins happy --- .github/workflows/test-jenkinsfile.yml | 2 +- plugins.txt | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 plugins.txt diff --git a/.github/workflows/test-jenkinsfile.yml b/.github/workflows/test-jenkinsfile.yml index 90f87eb..31712e7 100644 --- a/.github/workflows/test-jenkinsfile.yml +++ b/.github/workflows/test-jenkinsfile.yml @@ -1,4 +1,4 @@ -name: "Build CosmicKube game client" +name: "Test Jenkinsfile" on: push env: diff --git a/plugins.txt b/plugins.txt new file mode 100644 index 0000000..e69de29 From b3117aa14c1aa31f1e30c1629ab733d376869f5b Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 15:53:01 +0000 Subject: [PATCH 16/21] thing doesn't work (for now) --- .../{test-jenkinsfile.yml => test-jenkinsfile.yml.noworky} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test-jenkinsfile.yml => test-jenkinsfile.yml.noworky} (100%) diff --git a/.github/workflows/test-jenkinsfile.yml b/.github/workflows/test-jenkinsfile.yml.noworky similarity index 100% rename from .github/workflows/test-jenkinsfile.yml rename to .github/workflows/test-jenkinsfile.yml.noworky From 45d4244c6c9ed271959bcde817d64f4463313168 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 17:06:46 +0000 Subject: [PATCH 17/21] feat: added azure publish --- .github/workflows/build-game-client.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 5e69443..6dae186 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -35,9 +35,24 @@ jobs: echo "Build succeeded!" exit 0 fi ; + - name: Create staticwebapp.config.json + run: | + cd build/ + echo ${{ vars.STATIC_WEB_APP_CONFIG }} > staticwebapp.config.json - name: Upload Artifact uses: actions/upload-artifact@v1 with: name: web path: build/web - \ No newline at end of file + + - name: Publish to Azure Static Web Apps + id: publishto + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for GitHub integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations ###### + app_location: "build/web" + skip_app_build: true + ###### End of Repository/Build Configurations ###### \ No newline at end of file From f3b39e7938f60b2f554abb902e2edc5557cb9390 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 17:14:26 +0000 Subject: [PATCH 18/21] fix: escaping json --- .github/workflows/build-game-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 6dae186..ae26fb3 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -38,7 +38,7 @@ jobs: - name: Create staticwebapp.config.json run: | cd build/ - echo ${{ vars.STATIC_WEB_APP_CONFIG }} > staticwebapp.config.json + echo "${{ vars.STATIC_WEB_APP_CONFIG }}" > staticwebapp.config.json - name: Upload Artifact uses: actions/upload-artifact@v1 with: From 0176a89edf159870f19b44272fd5117421eca27f Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 17:18:44 +0000 Subject: [PATCH 19/21] debug: added list --- .github/workflows/build-game-client.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index ae26fb3..3d9b772 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -39,6 +39,7 @@ jobs: run: | cd build/ echo "${{ vars.STATIC_WEB_APP_CONFIG }}" > staticwebapp.config.json + ls - name: Upload Artifact uses: actions/upload-artifact@v1 with: From ad0d9f83f622915c4156147375f3ecbcb80b9432 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 17:23:28 +0000 Subject: [PATCH 20/21] fix: global headers --- .github/workflows/build-game-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 3d9b772..0680a54 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -37,7 +37,7 @@ jobs: fi ; - name: Create staticwebapp.config.json run: | - cd build/ + cd build/web echo "${{ vars.STATIC_WEB_APP_CONFIG }}" > staticwebapp.config.json ls - name: Upload Artifact From 12081fcc57ace162495e4ce530432951a6a9d3a3 Mon Sep 17 00:00:00 2001 From: Leo Durrant Date: Sat, 2 Mar 2024 17:31:50 +0000 Subject: [PATCH 21/21] fix: specified branches to run flow on --- .github/workflows/build-game-client.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-game-client.yml b/.github/workflows/build-game-client.yml index 0680a54..dc34095 100644 --- a/.github/workflows/build-game-client.yml +++ b/.github/workflows/build-game-client.yml @@ -1,5 +1,11 @@ name: "Build CosmicKube game client" -on: push +on: + push: + branches: + - main + pull_request: + branches: + - main env: GODOT_VERSION: 4.2.1