From 52e30044658448149b04e8f69b475eebbfbd8f6e Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Thu, 2 Oct 2025 15:08:21 -0700 Subject: [PATCH] [4.3] Simplify list of branches in the README (#1255) --- .github/workflows/export_web.yml | 119 ---------------------------- .github/workflows/static_checks.yml | 2 +- README.md | 25 +----- 3 files changed, 5 insertions(+), 141 deletions(-) delete mode 100644 .github/workflows/export_web.yml diff --git a/.github/workflows/export_web.yml b/.github/workflows/export_web.yml deleted file mode 100644 index 9b08c827..00000000 --- a/.github/workflows/export_web.yml +++ /dev/null @@ -1,119 +0,0 @@ -name: Export projects to Web and deploy to GitHub Pages -on: - push: - branches: - - master - -env: - GODOT_VERSION: 4.3 - -jobs: - export-html5: - name: Export projects to Web and deploy to GitHub Pages - runs-on: ubuntu-24.04 - container: - image: barichello/godot-ci:4.3 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup - run: | - mkdir -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: Export projects to Web - run: | - apt-get update -qq && apt-get install -qqq imagemagick - - # Don't export Mono demos (not supported yet), demos that can't be run in Web - # since they're platform-specific or demos that are currently broken in Web. - # Remember to update `.github/dist/footer.html` when updating the list of excluded demos. - rm -rf \ - 2d/glow/ \ - 2d/navigation_mesh_chunks/ \ - 2d/physics_tests/ \ - 3d/labels_and_texts/ \ - 3d/decals/ \ - 3d/ik/ \ - 3d/navigation_mesh_chunks/ \ - 3d/occlusion_culling_mesh_lod/ \ - 3d/particles/ \ - 3d/physical_light_camera_units/ \ - 3d/physics_tests/ \ - 3d/variable_rate_shading/ \ - 3d/volumetric_fog/ \ - 3d/voxel/ \ - audio/bpm_sync/ \ - audio/device_changer/ \ - audio/midi_piano/ \ - audio/spectrum/ \ - compute/ \ - gui/msdf_font/ \ - gui/translation/ \ - loading/runtime_save_load \ - misc/compute_shader_heightmap \ - misc/large_world_coordinates/ \ - misc/matrix_transform/ \ - mobile/android_iap/ \ - mobile/sensors/ \ - mono/ \ - networking/ \ - plugins/ \ - xr/ - - for panorama in 3d/material_testers/backgrounds/*.hdr; do - # Decrease the resolution to get below the 100 MB PCK size limit. - # Otherwise, the website can't be deployed as files larger than 100 MB - # can't be pushed to GitHub. - mogrify -resize 66.667% "$panorama" - done - - BASEDIR="$PWD" - - # Use absolute paths so that we can `cd` without having to go back to the parent directory manually. - for demo in */*/; do - echo "" - echo "" - echo "================================================================================" - echo "Exporting demo $demo..." - echo "================================================================================" - - mkdir -p "$BASEDIR/.github/dist/$demo" - cd "$BASEDIR/$demo" - - # Copy an export template preset file configured for Web exporting. - # This way, we don't have to commit `export_presets.cfg` for each project. - cp "$BASEDIR/.github/dist/export_presets.cfg" . - # Enable ETC2 texture importing, which is disabled by default (but required for web exports to work on mobile platforms). - echo "[rendering]\n\ntextures/vram_compression/import_etc2_astc=true" >> project.godot - - godot --verbose --headless --export-release "Web" "$BASEDIR/.github/dist/$demo/index.html" - - # Replace the WASM file with a symbolic link to avoid duplicating files in the pushed branch. - # (WASM files are identical across projects, but not PCK or HTML/JavaScript files.) - mv -f "$BASEDIR/.github/dist/$demo/index.wasm" "$BASEDIR/.github/dist/index.wasm" - # The symlink must be relative as it needs to point to a file within the pushed repository. - ln -s "../../index.wasm" "$BASEDIR/.github/dist/$demo/index.wasm" - - # Append the demo to the list of demos for the website. - PROJECT_NAME=$(cat project.godot | grep "config/name" | cut -d '"' -f 2 | tr -d "\n") - echo "

  • $PROJECT_NAME

    • " >> "$BASEDIR/.github/dist/demos.html" - done - - cat "$BASEDIR/.github/dist/header.html" "$BASEDIR/.github/dist/demos.html" "$BASEDIR/.github/dist/footer.html" > "$BASEDIR/.github/dist/index.html" - - # Clean up files that don't need to be deployed. - rm -f "$BASEDIR/.github/dist/header.html" "$BASEDIR/.github/dist/demos.html" "$BASEDIR/.github/dist/footer.html" "$BASEDIR/.github/dist/export_presets.cfg" - - # Installing rsync is needed in order to deploy to GitHub Pages. Without it, the build will fail. - - name: Install rsync 📚 - run: | - apt-get update -qq && apt-get install -qqq rsync - - name: Deploy to GitHub Pages 🚀 - uses: JamesIves/github-pages-deploy-action@releases/v4 - with: - # The folder the action should deploy. - folder: .github/dist - # Artifacts are large; don't keep the branch's history. - single-commit: true diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml index faa94978..ff91de42 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install dependencies run: | diff --git a/README.md b/README.md index 13e3b5b7..a37053db 100644 --- a/README.md +++ b/README.md @@ -8,27 +8,10 @@ be used with [Godot Engine](https://godotengine.org), the open source - The [`master`](https://github.com/godotengine/godot-demo-projects) branch is compatible with Godot's `master` development branch (next 4.x release). - The [`3.x`](https://github.com/godotengine/godot-demo-projects/tree/3.x) branch is compatible with Godot's `3.x` development branch (next 3.x release). -- The other branches are compatible with the matching stable versions of Godot: - - [`4.2`](https://github.com/godotengine/godot-demo-projects/tree/4.2) - branch for Godot 4.2.x. - - [`4.1`](https://github.com/godotengine/godot-demo-projects/tree/4.1) - branch for Godot 4.1.x. - - [`4.0`](https://github.com/godotengine/godot-demo-projects/tree/4.0) - branch for Godot 4.0.x. - - [`3.5`](https://github.com/godotengine/godot-demo-projects/tree/3.5) - branch for Godot 3.5.x. - - [`3.4`](https://github.com/godotengine/godot-demo-projects/tree/3.4) - branch for Godot 3.4.x. - - [`3.3`](https://github.com/godotengine/godot-demo-projects/tree/3.3) - branch for Godot 3.3.x. - - [`3.2`](https://github.com/godotengine/godot-demo-projects/tree/3.2) - branch for Godot 3.2.x. - - [`3.1`](https://github.com/godotengine/godot-demo-projects/tree/3.1) - branch for Godot 3.1.x. - - [`3.0`](https://github.com/godotengine/godot-demo-projects/tree/3.0) - branch for Godot 3.0.x. - - [`2.1`](https://github.com/godotengine/godot-demo-projects/tree/2.1) - branch for Godot 2.1.x. +- The other branches are compatible with the matching stable versions of Godot. + - [Click here](https://github.com/godotengine/godot-demo-projects/branches) to see all branches. + - For example, the [`2.1`](https://github.com/godotengine/godot-demo-projects/tree/2.1) + branch is for demos compatible with Godot 2.1.x. ## Importing all demos