diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 0aa1bf87bb..5f12c9530c 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -31,3 +31,10 @@ jobs: - name: Build the static website run: bundle exec jekyll build + + # Upload resulting "_site" directory as artifact + + - uses: actions/upload-artifact@v4 + with: + name: site + path: _site/ diff --git a/.github/workflows/build-website.yml b/.github/workflows/build-website.yml index e9d3c6a7cf..04d218aec4 100644 --- a/.github/workflows/build-website.yml +++ b/.github/workflows/build-website.yml @@ -36,10 +36,7 @@ jobs: - name: Build the static website run: bundle exec jekyll build - - # copy the versions.yml file to the root of the _site folder - - name: Copy versions.yml to _site - run: cp _data/versions.yml _site/versions.yml + # Publish the build results diff --git a/Gemfile.lock b/Gemfile.lock index e55025b906..10f2ad192f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,11 +55,13 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (3.30.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) + strscan (3.1.0) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (1.8.0) @@ -67,7 +69,7 @@ GEM PLATFORMS arm64-darwin-22 - x64-unknown + arm64-darwin-23 x64-unknown x86_64-linux @@ -80,4 +82,4 @@ DEPENDENCIES webrick (~> 1.7) BUNDLED WITH - 2.4.13 + 2.4.18 diff --git a/README.md b/README.md index 34f882161b..58d3c5c389 100644 --- a/README.md +++ b/README.md @@ -85,10 +85,6 @@ The project is built automatically by GitHub Actions whenever the `master` branc itself should not be deployed, as it only contains the source files. The built version of the website is available as the `published` branch instead. -The deployed website has to serve a file for the editor to read and check if there are new versions of the Engine available to -download. This file is `_data/versions.yml`. It gets copied to `_site/versions.yml` when the website is built using the GitHub -Action described in `.github/workflows/build-website.yml`. - Note that this is not relevant for local development. Locally you would build the website in place and then serve the `_site` folder. See the detailed instructions above. diff --git a/_data/authors.yml b/_data/authors.yml index 587dcb578e..e152301902 100644 --- a/_data/authors.yml +++ b/_data/authors.yml @@ -1,9 +1,9 @@ +- name: Adam Scott + image: /assets/images/authors/adamscott.webp - name: Andrea Catania image: /assets/images/authors/default_avatar.svg - name: Ariel Manzur image: /assets/images/authors/punto.png -- name: Bartleby Lawnjelly - image: /assets/images/authors/default_avatar.svg - name: Bastiaan Olij image: /assets/images/authors/bastiaan.jpg - name: Camille Mohr-Daurat @@ -42,8 +42,10 @@ image: /assets/images/authors/julian.webp - name: karroffel image: /assets/images/authors/default_avatar.svg -- name: Nathalie Galla - image: /assets/images/authors/nathalie.jpg +- name: lawnjelly + image: /assets/images/authors/lawnjelly.webp +- name: Nat + image: /assets/images/authors/nat.jpg - name: Nathan GDQuest image: /assets/images/authors/nathan.webp - name: Mark DiBarry diff --git a/_data/communities.yml b/_data/communities.yml index 4fdfa7ed17..5939dea2d1 100644 --- a/_data/communities.yml +++ b/_data/communities.yml @@ -85,12 +85,12 @@ China: - title: QQ Group url: https://qm.qq.com/cgi-bin/qm/qr?k=hEscGFbQTiOX0bhsTT2myxM3PifsAmIp&jump_from=webapi Croatia: - - name: Croatia + - name: Game Developers Croatia links: - title: Discord - url: https://discord.gg/6gjwfSG + url: https://discord.gg/CbZKkqR - title: Facebook - url: https://web.facebook.com/groups/godotenginecroatia/ + url: https://www.facebook.com/groups/gamedevcro Czech Republic and Slovakia: - name: Godot CZ/SK links: @@ -336,6 +336,10 @@ Taiwan: links: - title: Facebook url: https://www.facebook.com/groups/godot.taiwan + - name: Godot Adventurers (Godot 開拓者交流互助公會) + links: + - title: Discord + url: https://discord.gg/kpZ5G9HeYT Turkey: - name: Godot Engine Türkiye links: diff --git a/_data/sponsors.yml b/_data/sponsors.yml index 34be875c00..8f30a5938f 100644 --- a/_data/sponsors.yml +++ b/_data/sponsors.yml @@ -6,9 +6,6 @@ patron: link: "https://re-logic.com/" image: "https://fund.godotengine.org/static/logos/re-logic.png" platinum: - - name: "Heroic Labs" - link: "https://heroiclabs.com/" - image: "https://fund.godotengine.org/static/logos/heroiclabs.png" - name: "W4 Games" link: "https://w4games.com/" image: "https://fund.godotengine.org/static/logos/w4.png" @@ -47,9 +44,15 @@ silver: - name: "Chasing Carrots" link: "https://www.chasing-carrots.com" image: "https://fund.godotengine.org/static/logos/chasing-carrots.webp" - - name: "Null" - link: "https://null.com/" - image: "https://fund.godotengine.org/static/logos/null.svg" - name: "Indoor Astronaut" link: "https://indoorastronaut.ch/" image: "https://fund.godotengine.org/static/logos/indoor-astronaut.png" + - name: "LoadComplete" + link: "https://loadcomplete.com/" + image: "https://fund.godotengine.org/static/logos/loadcomplete.png" + - name: "Null" + link: "https://null.com/" + image: "https://fund.godotengine.org/static/logos/null.svg" + - name: Copia Wealth Studios + link: "https://copiawealthstudios.com/" + image: "https://fund.godotengine.org/static/logos/copia-wealth-studios.svg" \ No newline at end of file diff --git a/_data/versions.yml b/_data/versions.yml index 9b24d01b3f..cdd289d510 100644 --- a/_data/versions.yml +++ b/_data/versions.yml @@ -1,8 +1,23 @@ - name: "4.3" - flavor: "dev5" - release_date: "15 March 2024" - release_notes: "/article/dev-snapshot-godot-4-3-dev-5/" + flavor: "rc1" + release_date: "25 July 2024" + release_notes: "/article/release-candidate-godot-4-3-rc-1/" releases: + - name: "beta3" + release_date: "9 July 2024" + release_notes: "/article/dev-snapshot-godot-4-3-beta-3/" + - name: "beta2" + release_date: "20 June 2024" + release_notes: "/article/dev-snapshot-godot-4-3-beta-2/" + - name: "beta1" + release_date: "31 May 2024" + release_notes: "/article/dev-snapshot-godot-4-3-beta-1/" + - name: "dev6" + release_date: "1 May 2024" + release_notes: "/article/dev-snapshot-godot-4-3-dev-6/" + - name: "dev5" + release_date: "15 March 2024" + release_notes: "/article/dev-snapshot-godot-4-3-dev-5/" - name: "dev4" release_date: "29 February 2024" release_notes: "/article/dev-snapshot-godot-4-3-dev-4/" @@ -336,10 +351,16 @@ release_notes: "/article/dev-snapshot-godot-4-0-alpha-1/" - name: "3.6" - flavor: "beta4" - release_date: "25 January 2024" - release_notes: "/article/dev-snapshot-godot-3-6-beta-4/" + flavor: "rc1" + release_date: "9 July 2024" + release_notes: "/article/release-candidate-godot-3-6-rc-1/" releases: + - name: "beta5" + release_date: "13 May 2024" + release_notes: "/article/dev-snapshot-godot-3-6-beta-5/" + - name: "beta4" + release_date: "25 January 2024" + release_notes: "/article/dev-snapshot-godot-3-6-beta-4/" - name: "beta3" release_date: "16 August 2023" release_notes: "/article/dev-snapshot-godot-3-6-beta-3/" diff --git a/_includes/articles/download_card.html b/_includes/articles/download_card.html index c70fc35944..1e4fbca442 100644 --- a/_includes/articles/download_card.html +++ b/_includes/articles/download_card.html @@ -57,7 +57,7 @@ Export templates and other downloads - + Make a Donation diff --git a/_includes/download/download-section.html b/_includes/download/download-section.html new file mode 100644 index 0000000000..bd6a937d8a --- /dev/null +++ b/_includes/download/download-section.html @@ -0,0 +1,80 @@ + +
+ {% if include.title %} +

{{ include.title }}

+ {% else %} +

Ready to start?

+ {% endif %} + +
+ {% assign stable_version_3 = site.data.versions | find: "featured", "3" %} + {% assign stable_version_4 = site.data.versions | find: "featured", "4" %} + +

Download the latest version of Godot 4 right now and begin your creative journey!

+ +
Download Latest
+
{{ stable_version_4.name }}
+
+ + Looking for Godot 3 or a previous version? +
+
diff --git a/_includes/footer.html b/_includes/footer.html index c81faa9c4c..51d60929e5 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -14,37 +14,38 @@
-

Contact us

+

Contact us

GitHub @@ -110,7 +111,7 @@ link_platform = 'linux'; } - link.href = `/${link_slug}/${link_platform}`; + link.href = `/${link_slug}/${link_platform}/`; } }); diff --git a/_includes/header.html b/_includes/header.html index e32b4f1eb0..f88ac91879 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -13,18 +13,18 @@
+ + diff --git a/pages/community/community.html b/pages/community/community.html index be2564b54a..22e3a9bc0b 100644 --- a/pages/community/community.html +++ b/pages/community/community.html @@ -6,6 +6,9 @@ layout: default {% include header.html %}