Skip to content

Commit 7d07825

Browse files
Merge pull request #164 from Distributive-Network/Xmader/fix/detect-poetry-dynamic-versioning
fix: poetry-dynamic-versioning installation
2 parents 50bc2b8 + 8e14e41 commit 7d07825

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.github/workflows/test-and-publish.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ jobs:
4242
./_spidermonkey_install/*
4343
key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
4444
lookup-only: true # skip download
45-
- name: Setup Poetry
46-
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
47-
uses: snok/install-poetry@v1
48-
with:
49-
version: 1.5.1
5045
- name: Setup XCode
5146
if: ${{ matrix.os == 'macos-13' && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
5247
# SpiderMonkey 115 ESR requires XCode SDK version at least 13.3
@@ -67,11 +62,6 @@ jobs:
6762
./_spidermonkey_install/*
6863
key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
6964
lookup-only: true # skip download
70-
- name: Setup Poetry
71-
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
72-
uses: snok/install-poetry@v1
73-
with:
74-
version: 1.5.1
7565
- name: Install dependencies
7666
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
7767
shell: powershell

setup.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ fi
2424
curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.69 # force to use Rust 1.69 because 1.70 has linking issues on Windows
2525
# Setup Poetry
2626
curl -sSL https://install.python-poetry.org | python3 - --version "1.5.1"
27-
poetry self add "poetry-dynamic-versioning[plugin]"
27+
if [[ "$OSTYPE" == "msys"* ]]; then # Windows
28+
POETRY_BIN="$APPDATA/Python/Scripts/poetry"
29+
else
30+
POETRY_BIN=`echo ~/.local/bin/poetry` # expand tilde
31+
fi
32+
$POETRY_BIN self add 'poetry-dynamic-versioning[plugin]'
2833
echo "Done installing dependencies"
2934

3035
echo "Downloading spidermonkey source code"

0 commit comments

Comments
 (0)