fix(ci): align build version handling between tox and GitHub Actions

UWIT-IAM · Jan 16, 2025 · dbd6509 · dbd6509
1 parent 2b9a26e
commit dbd6509
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -60,9 +60,14 @@ jobs:
           poetry run pip install tox uw-it-build-fingerprinter
 
       - name: Build and test
+        env:
+          HUSKY_DIRECTORY_VERSION: ${{ env.version }}
         run: |
-          poetry run tox -e build-layers -- -t ${{ env.version }} --release ${{ env.version }} --cache --build-arg HUSKY_DIRECTORY_VERSION=${{ env.version }}
-          poetry run tox -e unit-tests
+          poetry run tox -e build-layers -- \
+            -t ${{ env.version }} \
+            --release ${{ env.version }} \
+            --cache
+          poetry run tox -e unit-tests        
 
       - name: Create release ${{ needs.configure-release.outputs.version }}
         uses: ncipollo/release-action@v1

diff --git a/tox.ini b/tox.ini
@@ -42,8 +42,8 @@ commands = black husky_directory tests
 
 
 [testenv:build-layers]
-commands = bash -c "set -x; $(fingerprinter -o build-script) -t tox {posargs} --build-arg HUSKY_DIRECTORY_VERSION=$(poetry version -s)"
-
+passenv = HUSKY_DIRECTORY_VERSION
+commands = bash -c "set -x; $(fingerprinter -o build-script) -t tox {posargs} --build-arg HUSKY_DIRECTORY_VERSION={env:HUSKY_DIRECTORY_VERSION:$(poetry version -s)}"
 
 [testenv:flake8]
 deps = flake8