Bläddra i källkod

Update o3de from HEAD to 2310.1

Signed-off-by: Jan Hanca <[email protected]>
Jan Hanca 1 år sedan
förälder
incheckning
d8ea904559
3 ändrade filer med 8 tillägg och 8 borttagningar
  1. 4 4
      docker/Dockerfile
  2. 1 1
      docker/Dockerfile.NavStack
  3. 3 3
      docker/Dockerfile.Simulation

+ 4 - 4
docker/Dockerfile

@@ -16,18 +16,18 @@ WORKDIR $WORKSPACE
 # O3DE Variables
 ARG O3DE_REPO=https://github.com/o3de/o3de.git
 ARG O3DE_BRANCH=main
-ARG O3DE_COMMIT=HEAD
+ARG O3DE_COMMIT=2310.1
 ENV O3DE_ROOT=$WORKSPACE/o3de
 
 # O3DE Extras Variables
 ARG O3DE_EXTRAS_REPO=https://github.com/o3de/o3de-extras.git
 ARG O3DE_EXTRAS_BRANCH=main
-ARG O3DE_EXTRAS_COMMIT=HEAD
+ARG O3DE_EXTRAS_COMMIT=2310.1
 ENV O3DE_EXTRAS_ROOT=$WORKSPACE/o3de-extras
 
 # ROSConDemo Variables
 ARG ROSCON_DEMO_REPO=https://github.com/o3de/ROSConDemo.git
-ARG ROSCON_DEMO_BRANCH=development
+ARG ROSCON_DEMO_BRANCH=main
 ARG ROSCON_DEMO_COMMIT=HEAD
 ENV ROSCON_DEMO_ROOT=$WORKSPACE/ROSConDemo
 ENV ROSCON_DEMO_PROJECT=$ROSCON_DEMO_ROOT/Project
@@ -143,7 +143,7 @@ RUN . /opt/ros/${ROS_DISTRO}/setup.sh \
              --target ROSConDemo.GameLauncher Editor ROSConDemo.Assets \
     \
     ############################################################### \
-    # Build the Editor, Tools, and clients
+    # Remove build artifacts
     ############################################################### \
     && rm -rf ~/.o3de/3rdParty/ \
     && rm -rf $O3DE_ROOT/.git \

+ 1 - 1
docker/Dockerfile.NavStack

@@ -15,7 +15,7 @@ WORKDIR $WORKSPACE
 
 # ROSConDemo Variables
 ARG ROSCON_DEMO_REPO=https://github.com/o3de/ROSConDemo.git
-ARG ROSCON_DEMO_BRANCH=development
+ARG ROSCON_DEMO_BRANCH=main
 ARG ROSCON_DEMO_COMMIT=HEAD
 ENV ROSCON_DEMO_ROOT=$WORKSPACE/ROSConDemo
 ENV ROSCON_DEMO_NAV_ROOT=$WORKSPACE/kraken_nav

+ 3 - 3
docker/Dockerfile.Simulation

@@ -16,18 +16,18 @@ WORKDIR $WORKSPACE
 # O3DE Variables
 ARG O3DE_REPO=https://github.com/o3de/o3de.git
 ARG O3DE_BRANCH=main
-ARG O3DE_COMMIT=HEAD
+ARG O3DE_COMMIT=2310.1
 ENV O3DE_ROOT=$WORKSPACE/o3de
 
 # O3DE Extras Variables
 ARG O3DE_EXTRAS_REPO=https://github.com/o3de/o3de-extras.git
 ARG O3DE_EXTRAS_BRANCH=main
-ARG O3DE_EXTRAS_COMMIT=HEAD
+ARG O3DE_EXTRAS_COMMIT=2310.1
 ENV O3DE_EXTRAS_ROOT=$WORKSPACE/o3de-extras
 
 # ROSConDemo Variables
 ARG ROSCON_DEMO_REPO=https://github.com/o3de/ROSConDemo.git
-ARG ROSCON_DEMO_BRANCH=development
+ARG ROSCON_DEMO_BRANCH=main
 ARG ROSCON_DEMO_COMMIT=HEAD
 ENV ROSCON_DEMO_ROOT=$WORKSPACE/ROSConDemo
 ENV ROSCON_DEMO_PROJECT=$ROSCON_DEMO_ROOT/Project