diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e38ebea8..e881c217 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,9 +81,6 @@ jobs: releases: name: Build Release Files runs-on: ${{ matrix.os }} - defaults: - run: - shell: bash strategy: fail-fast: ${{ github.event_name == 'push' }} matrix: @@ -99,11 +96,11 @@ jobs: - uses: actions/setup-python@v4 with: python-version: ${{ env.PYTHON_VERSION }} - - uses: snok/install-poetry@v1 - with: - version: ${{ env.POETRY_VERSION }} - virtualenvs-create: true - virtualenvs-in-project: true + - name: Setup Poetry + run: | + pip install --upgrade pip setuptools wheel poetry==${{ env.POETRY_VERSION }} + poetry config virtualenvs.create true --local + poetry config virtualenvs.in-project true --local - uses: actions/cache@v3 with: path: ./.venv @@ -121,8 +118,12 @@ jobs: id: filename shell: bash run: echo "FILENAME=scanner-${{ github.ref_name }}-${{ matrix.tag }}.zip" | sed -r 's,/,-,g' >> $GITHUB_OUTPUT - - name: Zip files + - name: Zip files (linux/macos) + if: matrix.tag == 'linux' || matrix.tag == 'macos' run: zip -j ./${{ steps.filename.outputs.FILENAME }} ./dist/* + - name: Zip files (win) + if: matrix.tag == 'win' + run: Compress-Archive ./dist/* ./${{ steps.filename.outputs.FILENAME }} - name: Upload archive uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1b88f36e..f5882ae4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,9 +10,6 @@ jobs: tests: name: Run Tests runs-on: ${{ matrix.os }} - defaults: - run: - shell: bash strategy: fail-fast: false matrix: @@ -23,18 +20,18 @@ jobs: - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - - uses: snok/install-poetry@v1 - with: - version: ${{ env.POETRY_VERSION }} - virtualenvs-create: true - virtualenvs-in-project: true + - name: Setup Poetry + run: | + pip install --upgrade pip setuptools wheel poetry==${{ env.POETRY_VERSION }} + poetry config virtualenvs.create true --local + poetry config virtualenvs.in-project true --local - uses: actions/cache@v3 with: path: ./.venv key: venv-test-poetry-${{ env.POETRY_VERSION }}-python-${{ matrix.python }}-${{ hashFiles('poetry.lock') }} - uses: actions/cache@v3 with: - path: ~/.cache/pre-commit/ + path: ~/.cache/pre-commit key: pre-commit-python-${{ matrix.python }}-${{ hashFiles('poetry.lock', '.pre-commit-config.yaml') }} - name: Install dependencies run: poetry install --no-interaction --without build diff --git a/.github/workflows/tgtg.yml b/.github/workflows/tgtg.yml index 64b40dff..da68379c 100644 --- a/.github/workflows/tgtg.yml +++ b/.github/workflows/tgtg.yml @@ -12,19 +12,16 @@ jobs: test: name: Run Test runs-on: ubuntu-latest - defaults: - run: - shell: bash steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: python-version: ${{ env.PYTHON_VERSION }} - - uses: snok/install-poetry@v1 - with: - version: ${{ env.POETRY_VERSION }} - virtualenvs-create: true - virtualenvs-in-project: true + - name: Setup Poetry + run: | + pip install --upgrade pip setuptools wheel poetry==${{ env.POETRY_VERSION }} + poetry config virtualenvs.create true --local + poetry config virtualenvs.in-project true --local - uses: actions/cache@v3 with: path: ./.venv diff --git a/tests/conftest.py b/tests/conftest.py index fa21b690..d8b0f145 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -162,7 +162,7 @@ def tgtg_item(): 'is_automatically_created': False }, 'is_manufacturer': False}, - 'display_name': 'Chutney Indian Food - Hamburg – Europapassage 2.OG', + 'display_name': 'Chutney Indian Food - Hamburg - Europapassage 2.OG', 'pickup_interval': { 'start': '2022-12-30T19:00:00Z', 'end': '2022-12-30T19:30:00Z'