Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
treiher committed Feb 23, 2024
1 parent 85fdffc commit 0b37a88
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/publishing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Poetry
run: |
# TODO(eng/recordflux/RecordFlux#1531): Remove installation of Poetry (and remove caching)
pipx install poetry==${{ env.POETRY_VERSION }}
pipx inject poetry poetry-dynamic-versioning==${{ env.POETRY_DYNAMIC_VERSIONING_VERSION }}
- name: Set up Python
uses: actions/setup-python@v5
with:
Expand All @@ -29,7 +24,6 @@ jobs:
3.9
3.10
3.11
cache: poetry
- name: Install Alire
uses: alire-project/setup-alire@v2
with:
Expand All @@ -42,8 +36,7 @@ jobs:
run: |
eval `make printenv_gnat`
gnat --version
# TODO(eng/recordflux/RecordFlux#1531): Remove explicit initialization
make init pypi_dist
make pypi_dist
- name: Store distribution packages
uses: actions/upload-artifact@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,9 @@ dist: $(SDIST)
$(SDIST): $(BUILD_DEPS) $(PARSER) $(VSIX) pyproject.toml $(wildcard rflx/*)
$(POETRY) build -vv --no-cache

pypi_dist:
pypi_dist: $(PROJECT_MANAGEMENT)
# Build distributions without local version identifier
$(foreach version,$(PYTHON_VERSIONS),poetry env use $(version) && $(MAKE) dist POETRY_DYNAMIC_VERSIONING_BYPASS=$$(poetry version -s | sed 's/+.*//') || exit;)
$(foreach version,$(PYTHON_VERSIONS),$(POETRY) env use $(version) && $(MAKE) dist POETRY_DYNAMIC_VERSIONING_BYPASS=$$(echo $(VERSION) | sed 's/+.*//') || exit;)

anod_dist: $(BUILD_DEPS) $(PARSER) pyproject.toml $(wildcard rflx/*)
$(POETRY) build -vv --no-cache
Expand Down

0 comments on commit 0b37a88

Please sign in to comment.