fixup

lehigh-university-libraries · Oct 30, 2024 · b8fbe68 · b8fbe68
1 parent 95fc254
commit b8fbe68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -46,10 +46,16 @@ jobs:
           fi
         fi
         echo "tag=$TAG" >> $GITHUB_OUTPUT
-        DRUPAL_MAJOR_MINOR=$(echo "${{ matrix.drupal-version }}" | cut -d. -f1 -f2)
+        DRUPAL_MAJOR_MINOR=$(echo "${{ matrix.drupal-version }}" | cut -d. -f1,2)
         echo "drupal_version=$DRUPAL_MAJOR_MINOR" >> $GITHUB_OUTPUT
       id: extract_tag
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Docker Hub Login
       uses: docker/login-action@v3
       with:
@@ -58,7 +64,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push dockerhub
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         platforms: |
           linux/amd64

diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
@@ -68,5 +68,6 @@ drush rs --quiet 127.0.0.1:8282 &
 until curl -s http://127.0.0.1:8282/; do true; done > /dev/null
 
 echo "Running phpunit"
+cp "$PHPUNIT_FILE" web/core/phpunit.xml
 cd "$DRUPAL_DIR/web/core"
 "$DRUPAL_DIR"/vendor/bin/phpunit --debug