From 0db1d5f83fa55b964208483b388f86f70df779d1 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sat, 14 Sep 2024 17:38:10 -0500 Subject: [PATCH] fix up --- .evergreen/ensure-binary.sh | 13 ++++--- .github/workflows/tests.yml | 68 ++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/.evergreen/ensure-binary.sh b/.evergreen/ensure-binary.sh index ceedecc6..d5f36959 100755 --- a/.evergreen/ensure-binary.sh +++ b/.evergreen/ensure-binary.sh @@ -66,11 +66,6 @@ case $NAME in esac esac -if [ -z "$URL" ]; then - echo "Unsupported for $NAME: $OS_NAME-$MARCH" - return 1 -fi - # Set up variables for Go. GOROOT=${GOROOT:-/opt/golang/go1.22} if [ "${OS:-}" == "Windows_NT" ]; then @@ -84,6 +79,10 @@ echo "Installing $NAME..." case $NAME in gcloud) # Google Cloud needs special handling: we need a symlink to the source location. + if [ -z "$URL" ]; then + echo "Unsupported for $NAME: $OS_NAME-$MARCH" + return 1 + fi pushd /tmp rm -rf google-cloud-sdk FNAME=/tmp/google-cloud-sdk.tgz @@ -99,6 +98,10 @@ case $NAME in ;; *) # Download directly using curl. + if [ -z "$URL" ]; then + echo "Unsupported for $NAME: $OS_NAME-$MARCH" + return 1 + fi mkdir -p ${DRIVERS_TOOLS}/.bin TARGET=${DRIVERS_TOOLS}/.bin/$NAME retry_with_backoff curl -L -s $URL -o $TARGET diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 52f86858..bd618f9c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,43 +9,43 @@ on: - "master" jobs: - tests: - name: "Tests" - runs-on: ${{ matrix.os }} + # tests: + # name: "Tests" + # runs-on: ${{ matrix.os }} - strategy: - matrix: - os: - - "ubuntu-latest" - - "windows-latest" - - "macos-latest" - mongodb-version: - - "7.0" - topology: - - "server" - - "replica_set" - - "sharded_cluster" - auth: - - "noauth" - - "auth" - ssl: - - "nossl" - - "ssl" + # strategy: + # matrix: + # os: + # - "ubuntu-latest" + # - "windows-latest" + # - "macos-latest" + # mongodb-version: + # - "7.0" + # topology: + # - "server" + # - "replica_set" + # - "sharded_cluster" + # auth: + # - "noauth" + # - "auth" + # ssl: + # - "nossl" + # - "ssl" - steps: - - name: "Checkout" - uses: "actions/checkout@v4" - with: - fetch-depth: 2 + # steps: + # - name: "Checkout" + # uses: "actions/checkout@v4" + # with: + # fetch-depth: 2 - - id: setup-mongodb - name: "Test GitHub Action" - uses: ./ - with: - version: ${{ matrix.mongodb-version }} - topology: ${{ matrix.topology }} - auth: ${{ matrix.auth }} - ssl: ${{ matrix.ssl }} + # - id: setup-mongodb + # name: "Test GitHub Action" + # uses: ./ + # with: + # version: ${{ matrix.mongodb-version }} + # topology: ${{ matrix.topology }} + # auth: ${{ matrix.auth }} + # ssl: ${{ matrix.ssl }} pre-commit: runs-on: ubuntu-latest