setup-qemu-action

remove custom docker-compose install
NREL · Jan 29, 2025 · 06d6476 · 06d6476
1 parent 34bd86b
commit 06d6476
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/openstudio-server-tests.yml b/.github/workflows/openstudio-server-tests.yml
@@ -93,6 +93,8 @@ jobs:
       run: rm -rf /opt/hostedtoolcache 
     - name: Check out repository
       uses: actions/checkout@v4
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3  
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3  
     - name: setup

diff --git a/ci/github-actions/setup.sh b/ci/github-actions/setup.sh
@@ -3,11 +3,11 @@
 echo "The build architecture is ${ImageOS}"
 
 if [ "${ImageOS}" == "ubuntu22" ] && [ "${BUILD_TYPE}" == "docker" ]; then
-    echo "Installing docker compose"
-    sudo rm /usr/local/bin/docker-compose
-    curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-    chmod +x docker-compose
-    sudo mv docker-compose /usr/local/bin
+    #echo "Installing docker compose"
+    #sudo rm /usr/local/bin/docker-compose
+    #curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+    #chmod +x docker-compose
+    #sudo mv docker-compose /usr/local/bin
     # install pipeviewer
     sudo apt-get update
     sudo apt-get install -y pv ruby