diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a109d43..480c108 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,10 +31,6 @@ jobs: uses: docker/setup-buildx-action@v3 with: platforms: linux/amd64,linux/arm64 - - - name: Install yq - run: | - sudo snap install yq - name: Setup BATS uses: mig4/setup-bats@v1 @@ -47,5 +43,6 @@ jobs: name: "Test ddev ${{ matrix.version }} image" shell: 'script -q -e -c "bash {0}"' run: | + sudo snap install yq ./build.sh -v ${{ matrix.version }} -l DDEV_VERSION=${{ matrix.version }} bash bats tests diff --git a/tests/test.bats b/tests/test.bats index 33b4c48..06b7fb6 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -8,6 +8,8 @@ version=$(echo "$output" | yq .Client.Version) regex='^([0-9]+)\.([0-9]+)\.([0-9]+)$' + echo $version + [[ $version =~ $regex ]] [ "$status" -eq 0 ] } @@ -20,6 +22,8 @@ version=$(echo "$output" | head -2 | tail -1 | yq '.raw.["DDEV version"]') regex='^v([0-9]+)\.([0-9]+)\.([0-9]+)$' + echo $version + [[ $version =~ $regex ]] [ "$status" -eq 0 ] }