Skip to content

Commit

Permalink
Merge pull request #870 from rstudio/workbench-session-init-release-b…
Browse files Browse the repository at this point in the history
…uild-fix-tests

Use env var for WORKBENCH_SESSION_INIT_VERSION or default to `get-version` to fetch version
  • Loading branch information
ianpittwood authored Nov 15, 2024
2 parents f354d51 + 00cb98c commit deb3a6e
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,13 @@ delete-builder:
alias build := bake
# just bake workbench-images
bake target="default":
#!/bin/bash
just -f {{justfile()}} create-builder || true
if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then
WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
fi
GIT_SHA=$(git rev-parse --short HEAD) \
WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local) \
WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \
docker buildx bake --builder=posit-builder -f docker-bake.hcl {{target}}

# just preview-bake workbench-images dev
Expand Down Expand Up @@ -90,8 +94,12 @@ preview-plan branch="$(git branch --show-current)":

# just test workbench
test target="default" file="docker-bake.hcl":
#!/bin/bash
if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then
WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
fi
GIT_SHA=$(git rev-parse --short HEAD) \
WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local) \
WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \
python3 {{justfile_directory()}}/tools/test_bake_artifacts.py --target "{{target}}" --file "{{file}}"

# just preview-test connect dev
Expand Down

0 comments on commit deb3a6e

Please sign in to comment.