Merge branch 'master' into feature/upgrade-test-project-to-4x

abarichello · Jan 27, 2024 · 49824f7 · 49824f7
2 parents f45af8e + e5670b7
commit 49824f7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 35 deletions.
diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml
@@ -57,39 +57,38 @@ jobs:
           name: test-project-linux-x86_64
           path: build/linux
 
-  # removed the export-web until it is fixed in 4x
-  # export-web:
-  #     name: Web Export
-  #     runs-on: ubuntu-20.04
-  #     container:
-  #       image: barichello/godot-ci:3.3.4
-  #     steps:
-  #       - name: Checkout
-  #         uses: actions/checkout@v2
-  #         with:
-  #           lfs: true
-  #       - name: Setup
-  #         run: |
-  #           mkdir -v -p ~/.local/share/godot/templates
-  #           mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
-  #       - name: Web Build
-  #         run: |
-  #           mkdir -v -p build/web
-  #           cd $PROJECT_PATH
-  #           godot --headless --verbose --export-release "HTML5" ../build/web/index.html
-  #       - name: Upload Artifact
-  #         uses: actions/upload-artifact@v1
-  #         with:
-  #           name: web
-  #           path: build/web
-  #       - name: Install rsync 📚
-  #         run: |
-  #           apt-get update && apt-get install -y rsync
-  #       - name: Deploy to GitHub Pages 🚀
-  #         uses: JamesIves/github-pages-deploy-action@releases/v4
-  #         with:
-  #           branch: gh-pages # The branch the action should deploy to.
-  #           folder: build/web # The folder the action should deploy.
+  export-web:
+    name: Web Export
+    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/templates
+          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
+      - name: Web Build
+        run: |
+          mkdir -v -p build/web
+          cd $PROJECT_PATH
+          godot --headless --verbose --export-release "HTML5" ../build/web/index.html
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: web
+          path: build/web
+      - name: Install rsync 📚
+        run: |
+          apt-get update && apt-get install -y rsync
+      - name: Deploy to GitHub Pages 🚀
+        uses: JamesIves/github-pages-deploy-action@releases/v4
+        with:
+          branch: gh-pages # The branch the action should deploy to.
+          folder: build/web # The folder the action should deploy.
 
   export-mac:
     name: Mac Export

diff --git a/Dockerfile b/Dockerfile
@@ -11,11 +11,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     wget \
     zip \
     adb \
-    openjdk-11-jdk-headless \
+    openjdk-17-jdk-headless \
     rsync \
     && rm -rf /var/lib/apt/lists/*
 
-ARG GODOT_VERSION="4.0.2"
+ARG GODOT_VERSION="4.2.1"
 ARG RELEASE_NAME="stable"
 ARG SUBDIR=""
 ARG GODOT_TEST_ARGS=""