From c680ac1fdb7f3672ff7b30bfdb3c1179d7ba3fd1 Mon Sep 17 00:00:00 2001
From: Robert Wittman <robkwittman@gmail.com>
Date: Tue, 11 Jul 2023 12:08:16 -0400
Subject: [PATCH] Fix parsing of environment variable

---
 .github/workflows/build.yml |  8 ++++----
 docker-bake.hcl             | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1ff52b89..2f4ff92c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,6 +63,7 @@ jobs:
     env:
       # TODO: This should not be SHA, but branch / tag name
       TAG: ${{ github.sha }}
+      VERSION: ${{ matrix.version }}
     steps:
       - uses: actions/checkout@v3
       - name: Install Task
@@ -84,7 +85,7 @@ jobs:
         uses: docker/bake-action@v3
         with:
           push: false
-          targets: python
+          targets: python_${VERSION//./_}
 
   build_rlang_kernels:
     runs-on: ubuntu-latest
@@ -97,8 +98,7 @@ jobs:
     env:
       # TODO: This should not be SHA, but branch / tag name
       TAG: ${{ github.sha }}
-      NBL_LANGUAGE_VERSION: ${{ matrix.version }}
-      IDENTIFIER: base
+      VERSION: ${{ matrix.version }}
     steps:
       - uses: actions/checkout@v3
       - name: Install Task
@@ -117,4 +117,4 @@ jobs:
         uses: docker/bake-action@v3
         with:
           push: false
-          targets: rlang
+          targets: rlang_${VERSION//./_}
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 27a2eec1..b3e02f33 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -24,6 +24,28 @@ group "python_base" {
   ]
 }
 
+group "python_3_9" {
+  targets = [
+    "python_base_3_9",
+    "python_noteable_3_9",
+    "python_datascience_3_9",
+  ]
+}
+
+group "python_3_10" {
+  targets = [
+    "python_base_3_10",
+    "python_noteable_3_10",
+    "python_datascience_3_10",
+  ]
+}
+
+group "python_3_11" {
+  targets = [
+    "python_base_3_11",
+    "python_datascience_3_11",
+  ]
+}
 group "python" {
   targets = [
     "python_base_3_9",