Skip to content

Commit

Permalink
ci: use python3 instead of python3.6 in build.sh (googleapis#425)
Browse files Browse the repository at this point in the history
* ci: skip docfx in main 'Kokoro' presubmit

* fix: specify default sessions in noxfile

* fix: use python3 instead of 3.6

* fix: add NOX_SESSION to pass down envvars

* fix: remove quotes arround sessions

Co-authored-by: Tim Swast <swast@google.com>
  • Loading branch information
2 people authored and mamo3gr committed Dec 2, 2022
1 parent 6391b99 commit 5a58e7d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")

# Remove old nox
python3.6 -m pip uninstall --yes --quiet nox-automation
python3 -m pip uninstall --yes --quiet nox-automation

# Install nox
python3.6 -m pip install --upgrade --quiet nox
python3.6 -m nox --version
python3 -m pip install --upgrade --quiet nox
python3 -m nox --version

# If NOX_SESSION is set, it only runs the specified session,
# otherwise run all the sessions.
if [[ -n "${NOX_SESSION:-}" ]]; then
python3.6 -m nox -s "${NOX_SESSION:-}"
python3 -m nox -s ${NOX_SESSION:-}
else
python3.6 -m nox
python3 -m nox
fi
2 changes: 2 additions & 0 deletions .trampolinerc
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
required_envvars+=(
"STAGING_BUCKET"
"V2_STAGING_BUCKET"
"NOX_SESSION"
)

# Add env vars which are passed down into the container here.
pass_down_envvars+=(
"STAGING_BUCKET"
"V2_STAGING_BUCKET"
"NOX_SESSION"
)

# Prevent unintentional override on the default image.
Expand Down

0 comments on commit 5a58e7d

Please sign in to comment.