Skip to content

Commit

Permalink
fix up
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 committed Sep 14, 2024
1 parent baf9796 commit 0db1d5f
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 39 deletions.
13 changes: 8 additions & 5 deletions .evergreen/ensure-binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
68 changes: 34 additions & 34 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0db1d5f

Please sign in to comment.