From dbeb8b3d4e25dbca808018dacb1a64b0d2f00e4e Mon Sep 17 00:00:00 2001 From: soufianerafik Date: Thu, 16 Jan 2025 15:53:26 -0800 Subject: [PATCH] fix(ci): Attempt to Fix argument parsing for build-layers --- .github/workflows/create-release.yml | 5 +++-- tox.ini | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 7dd6323..919bab4 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -61,8 +61,9 @@ jobs: - name: Build and test 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 build-layers \ + -- -- -t ${{ env.version }} --release ${{ env.version }} --cache \ + --build-arg HUSKY_DIRECTORY_VERSION=${{ env.version }} poetry run tox -e unit-tests - name: Create release ${{ needs.configure-release.outputs.version }} diff --git a/tox.ini b/tox.ini index 15c73c3..4aa40c8 100644 --- a/tox.ini +++ b/tox.ini @@ -42,7 +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={env:HUSKY_DIRECTORY_VERSION}" +commands = bash -c "set -x; $(fingerprinter -o build-script) -t tox {posargs} --build-arg HUSKY_DIRECTORY_VERSION=$(poetry version -s)" + [testenv:flake8] deps = flake8 @@ -63,8 +64,6 @@ commands = docker run \ [testenv:development-server] -# The '-' here tells tox to ignore the exit code of the command, -# so it's less confusing for new developers. passenv = UWCA_CERT_PATH UWCA_CERT_NAME