diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 22cbf74..4c45c77 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,9 +29,6 @@ jobs: runs-on: ubuntu-latest steps: - - name: Setup SSH - run: ssh-keyscan -t rsa git.drupal.org >> ~/.ssh/known_hosts - - uses: ddev/github-action-add-on-test@v2 with: ddev_version: ${{ matrix.ddev_version }} diff --git a/tests/test.bats b/tests/test.bats index d8514f8..06d76e8 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -6,15 +6,18 @@ setup() { export PROJNAME=ddev-drupal-core-dev export DDEV_NON_INTERACTIVE=true ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true - git clone git@git.drupal.org:project/drupal.git ${TESTDIR} + curl -L -o /tmp/drupal.tar.gz https://ftp.drupal.org/files/projects/drupal-11.x-dev.tar.gz + tar --strip-components 1 -zxf /tmp/drupal.tar.gz -C ${TESTDIR} cd "${TESTDIR}" - ddev config --project-name=${PROJNAME} + ddev config --project-name=${PROJNAME} --upload-dirs=.ddev/tmp + ddev config --update ddev start -y >/dev/null } health_checks() { ddev exec "curl -s chrome:7900" | grep "noVNC" ddev exec "curl -s firefox:7901" | grep "noVNC" + ddev phpunit core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php } teardown() { @@ -33,12 +36,13 @@ teardown() { health_checks } -@test "install from release" { - set -eu -o pipefail - cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 ) - echo "# ddev get ddev/ddev-addon-template with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 - ddev get justafish/ddev-drupal-core-dev - ddev restart >/dev/null - health_checks -} +#TODO: Re-enable release tests after the add-on has a release with DDEV v1.23.0 support +#@test "install from release" { +# set -eu -o pipefail +# cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 ) +# echo "# ddev get ddev/ddev-addon-template with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3 +# ddev get justafish/ddev-drupal-core-dev +# ddev restart >/dev/null +# health_checks +#} diff --git a/web-build/Dockerfile b/web-build/Dockerfile index dd8f5e4..ee3af69 100644 --- a/web-build/Dockerfile +++ b/web-build/Dockerfile @@ -3,3 +3,15 @@ RUN sudo apt-get update && sudo apt-get install chromium-driver -y # This will not be necessary in DDEV v1.23+ RUN corepack enable + +# TODO: +# This section is temporary and needs to be removed when +# https://github.com/justafish/ddev-drupal-core-dev/pull/23/files#top +# is pulled, because it includes this update. +ARG TARGETPLATFORM +RUN SQLITE_VERSION=3.45.1 && \ + mkdir -p /tmp/sqlite3 && \ + wget -O /tmp/sqlite3/sqlite3.deb https://ftp.debian.org/debian/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETPLATFORM##linux/}.deb && \ + wget -O /tmp/sqlite3/libsqlite3.deb https://ftp.debian.org/debian/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETPLATFORM##linux/}.deb && \ + dpkg -i /tmp/sqlite3/*.deb && \ + rm -rf /tmp/sqlite3