From 58bfd8d0b0ba4dcd9f09289671ec2015f0fe226d Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Thu, 2 Oct 2025 17:05:22 -0700 Subject: [PATCH] [4.0] Simplify list of branches in the README (#1255) --- .github/workflows/export_html5.yml.disabled | 100 -------------------- .github/workflows/static_checks.yml | 4 +- README.md | 21 +--- 3 files changed, 6 insertions(+), 119 deletions(-) delete mode 100644 .github/workflows/export_html5.yml.disabled diff --git a/.github/workflows/export_html5.yml.disabled b/.github/workflows/export_html5.yml.disabled deleted file mode 100644 index 193883fb..00000000 --- a/.github/workflows/export_html5.yml.disabled +++ /dev/null @@ -1,100 +0,0 @@ -name: Export projects to HTML5 and deploy to GitHub Pages -on: - push: - branches: - - master - -env: - GODOT_VERSION: 3.3.3 - -jobs: - export-html5: - name: Export projects to HTML5 and deploy to GitHub Pages - runs-on: ubuntu-20.04 - container: - image: barichello/godot-ci:3.3.3 - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup - run: | - mkdir -p ~/.local/share/godot/templates/ - mv /root/.local/share/godot/templates/$GODOT_VERSION.stable ~/.local/share/godot/templates/$GODOT_VERSION.stable - - - name: Export projects to HTML5 - 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 HTML5 - # since they're platform-specific or demos that are currently broken in HTML5. - # Remember to update `.github/dist/footer.html` when updating the list of excluded demos. - rm -rf \ - 2d/hdr/ \ - 3d/global_illumination/ \ - 3d/voxel/ \ - audio/device_changer/ \ - loading/background_load/ \ - loading/multiple_threads_loading/ \ - loading/threads/ \ - misc/matrix_transform/ \ - mobile/android_iap/ \ - mobile/sensors/ \ - mono/ \ - networking/ \ - plugins/ - - for panorama in 3d/material_testers/backgrounds/*.hdr; do - # Decrease the resolution to get below the 20 MB per-file limit. - # Otherwise, the website can't be deployed as files larger than 20 MB - # can't be pushed to GitHub anymore. - mogrify -resize 75% "$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 "Exporting demo $demo..." - echo "================================" - - mkdir -p "$BASEDIR/.github/dist/$demo" - cd "$BASEDIR/$demo" - - # Copy an export template preset file configured for HTML5 exporting. - # This way, we don't have to commit `export_presets.cfg` for each project. - cp "$BASEDIR/.github/dist/export_presets.cfg" . - godot --export "HTML5" "$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 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/v3 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # The branch the action should deploy to. - BRANCH: gh-pages - # 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 fd1463af..ff91de42 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -4,10 +4,10 @@ on: [push, pull_request] jobs: format: name: File formatting (file_format.sh) - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v5 - name: Install dependencies run: | diff --git a/README.md b/README.md index a37dbcc4..a37053db 100644 --- a/README.md +++ b/README.md @@ -8,23 +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.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