Fix parsing of environment variable

noteable-io · Jul 11, 2023 · c680ac1 · c680ac1
1 parent 2ef4f36
commit c680ac1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git 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
@@ -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",