Skip to content

Commit f260090

Browse files
authored
Use UV exclusively for binaries (#145)
1 parent 23ce28e commit f260090

File tree

3 files changed

+6
-238
lines changed

3 files changed

+6
-238
lines changed

.github/workflows/build-distributions.yml

Lines changed: 0 additions & 191 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ env:
2222
APP_NAME: dda
2323
PYTHON_VERSION: "3.12"
2424
PYOXIDIZER_VERSION: "0.24.0"
25-
DIST_URL: "https://github.com/DataDog/datadog-agent-dev/releases/download"
2625

2726
jobs:
2827
python-artifacts:
@@ -108,11 +107,9 @@ jobs:
108107
# Linux
109108
- target: aarch64-unknown-linux-gnu
110109
os: ubuntu-22.04
111-
use-dist: true
112110
cross: true
113111
- target: x86_64-unknown-linux-gnu
114112
os: ubuntu-22.04
115-
use-dist: true
116113
cross: true
117114
- target: x86_64-unknown-linux-musl
118115
os: ubuntu-22.04
@@ -123,22 +120,19 @@ jobs:
123120
# Windows
124121
- target: x86_64-pc-windows-msvc
125122
os: windows-2022
126-
use-dist: true
127123
- target: i686-pc-windows-msvc
128124
os: windows-2022
129125
# macOS
130126
- target: aarch64-apple-darwin
131127
os: macos-13
132-
use-dist: true
133128
- target: x86_64-apple-darwin
134129
os: macos-13
135-
use-dist: true
136130

137131
env:
138132
CARGO: cargo
139133
CARGO_BUILD_TARGET: ${{ matrix.job.target }}
140134
PYAPP_REPO: pyapp
141-
PYAPP_VERSION: "0.25.0"
135+
PYAPP_VERSION: "0.27.0"
142136
PYAPP_UV_ENABLED: "true"
143137
PYAPP_PASS_LOCATION: "true"
144138

@@ -196,26 +190,14 @@ jobs:
196190
name: python-artifacts
197191
path: dist
198192

199-
- name: Configure embedded project
193+
- name: Configure dev build
200194
if: ${{ !startsWith(github.event.ref, 'refs/tags') }}
201195
run: |-
202196
cd dist
203197
wheel="$(echo *.whl)"
204198
mv "$wheel" "../$PYAPP_REPO"
205199
echo "PYAPP_PROJECT_PATH=$wheel" >> $GITHUB_ENV
206200
207-
- name: Configure release with distribution
208-
if: startsWith(github.event.ref, 'refs/tags') && matrix.job.use-dist
209-
run: |-
210-
echo "PYAPP_SKIP_INSTALL=true" >> $GITHUB_ENV
211-
echo "PYAPP_FULL_ISOLATION=true" >> $GITHUB_ENV
212-
echo "PYAPP_DISTRIBUTION_SOURCE=${{ env.DIST_URL }}/v${{ needs.python-artifacts.outputs.version }}/dda-dist-${{ matrix.job.target }}.tar.gz" >> $GITHUB_ENV
213-
echo "PYAPP_DISTRIBUTION_PATH_PREFIX=python" >> $GITHUB_ENV
214-
echo "PYAPP_ALLOW_UPDATES=true" >> $GITHUB_ENV
215-
216-
# Disable in the case of self updates
217-
echo "PYAPP_UV_ENABLED=false" >> $GITHUB_ENV
218-
219201
- name: Build binary
220202
run: hatch build --target binary
221203

@@ -531,46 +513,20 @@ jobs:
531513
path: signed/${{ steps.pkg.outputs.path }}
532514
if-no-files-found: error
533515

534-
distributions-dev:
535-
name: Build development distributions
536-
if: ${{ !startsWith(github.event.ref, 'refs/tags') }}
537-
uses: ./.github/workflows/build-distributions.yml
538-
# This actually does not need the binary jobs but we want to prioritize
539-
# resources for the test jobs therefore this forces these later on
540-
needs: binaries
541-
542-
distributions-release:
543-
name: Build release distributions
544-
needs:
545-
- python-artifacts
546-
- publish-pypi
547-
if: startsWith(github.event.ref, 'refs/tags')
548-
uses: ./.github/workflows/build-distributions.yml
549-
with:
550-
version: ${{ needs.python-artifacts.outputs.version }}
551-
552516
publish-release:
553517
name: Publish distributions
554518
if: startsWith(github.event.ref, 'refs/tags')
555519
needs:
556520
- binaries
557521
- windows-packaging
558522
- macos-packaging
559-
- distributions-release
560523
runs-on: ubuntu-latest
561524

562525
permissions:
563526
contents: write
564527
id-token: write
565528

566529
steps:
567-
- name: Download distributions
568-
uses: actions/download-artifact@v4
569-
with:
570-
pattern: distribution-*
571-
path: distributions
572-
merge-multiple: true
573-
574530
- name: Download binaries
575531
uses: actions/download-artifact@v4
576532
with:
@@ -603,5 +559,4 @@ jobs:
603559
with:
604560
files: |-
605561
archives/*
606-
distributions/*
607562
installers/*

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

99
## Unreleased
1010

11+
***Added:***
12+
13+
- No longer build pre-configured Python distributions for release builds
14+
1115
***Fixed:***
1216

1317
- Fix telemetry daemon spawning on Windows when installed inside a virtual environment

0 commit comments

Comments
 (0)