From 7cec9975d2a490a219f4f5dd331f80777a37920c Mon Sep 17 00:00:00 2001
From: Skye Turriff <turriff.skye@gmail.com>
Date: Mon, 16 Dec 2024 10:14:32 -0700
Subject: [PATCH] Reenable workbench-session-init release target and remove
 WORKBENCH_SESSION_INIT_VERSION usage

---
 .github/workflows/build-bake.yaml | 22 ----------------------
 Justfile                          | 10 ----------
 docker-bake.hcl                   | 10 +++-------
 3 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml
index 3159e343..b80de200 100644
--- a/.github/workflows/build-bake.yaml
+++ b/.github/workflows/build-bake.yaml
@@ -333,7 +333,6 @@ jobs:
           snyk-token: '${{ secrets.SNYK_TOKEN }}'
 
   workbench-session-init:
-    if: false  # TODO: Re-enable this job after next release
     needs: [setup]
     name: Workbench Session Init
     runs-on: ubuntu-latest-8x
@@ -363,28 +362,7 @@ jobs:
         with:
           buildkitd-config: ./share/buildkitd.toml
 
-      - name: Set up Just
-        uses: extractions/setup-just@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-
-      - name: Install Python dependencies
-        run: |
-          pip install requests
-
-      - name: Get Version
-        id: get-version
-        run: |
-          WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
-          echo "WORKBENCH_SESSION_INIT_VERSION=$WORKBENCH_SESSION_INIT_VERSION" >> $GITHUB_OUTPUT
-
       - name: Build, Test, and Push
-        env:
-          WORKBENCH_SESSION_INIT_VERSION: ${{ steps.get-version.outputs.WORKBENCH_SESSION_INIT_VERSION }}
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
diff --git a/Justfile b/Justfile
index cebb9cc7..dd19bc9c 100644
--- a/Justfile
+++ b/Justfile
@@ -49,13 +49,8 @@ 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=${WORKBENCH_SESSION_INIT_VERSION} \
     docker buildx bake --builder=posit-builder -f docker-bake.hcl {{target}}
 
 # just preview-bake workbench-images dev
@@ -93,12 +88,7 @@ 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=${WORKBENCH_SESSION_INIT_VERSION} \
     python3 {{justfile_directory()}}/tools/test_bake_artifacts.py --target "{{target}}" --file "{{file}}"
 
 # just preview-test connect dev
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 5cc53ea9..55fc0ecf 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -11,10 +11,6 @@ variable WORKBENCH_VERSION {
     default = "2024.09.1+394.pro7"
 }
 
-variable WORKBENCH_SESSION_INIT_VERSION {
-    default = ""
-}
-
 variable DRIVERS_VERSION {
     default = "2024.03.0"
 }
@@ -500,8 +496,8 @@ target "workbench-session-init" {
     inherits = ["base"]
     target = "build"
 
-    name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_SESSION_INIT_VERSION), ".", "-")}"
-    tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_SESSION_INIT_VERSION)
+    name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_VERSION), ".", "-")}"
+    tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_VERSION)
 
     dockerfile = "Dockerfile.${builds.os}"
     context = "workbench-session-init"
@@ -509,7 +505,7 @@ target "workbench-session-init" {
     matrix = WORKBENCH_SESSION_INIT_BUILD_MATRIX
 
     args = {
-        RSW_VERSION = WORKBENCH_SESSION_INIT_VERSION
+        RSW_VERSION = WORKBENCH_VERSION
     }
 }