From 845cab712434851777f09b3f124e3e5489ad2c15 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Mon, 3 Feb 2025 22:23:23 -0800 Subject: [PATCH] drop progress bar from wget downloads; rename matrix vars --- .github/workflows/python-package.yml | 38 ++++++++++++++-------------- build_integration.sh | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 40c501af4..e7922c91f 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -17,12 +17,12 @@ jobs: build: runs-on: ubuntu-latest - name: Tests on ${{ matrix.python-version }} + name: Test: python ${{ matrix.python }} / kafka ${{ matrix.kafka }} continue-on-error: ${{ matrix.experimental || false }} strategy: fail-fast: false matrix: - kafka-version: + kafka: - "0.8.2.2" - "0.9.0.1" - "0.10.2.2" @@ -31,30 +31,30 @@ jobs: - "2.4.0" - "2.5.0" - "2.6.0" - python-version: + python: - "3.12" include: - #- python-version: "pypy3.9" - # kafka-version: "2.6.0" + #- python: "pypy3.9" + # kafka: "2.6.0" # experimental: true - #- python-version: "~3.13.0-0" - # kafka-version: "2.6.0" + #- python: "~3.13.0-0" + # kafka: "2.6.0" # experimental: true - - python-version: "3.8" - kafka-version: "2.6.0" - - python-version: "3.9" - kafka-version: "2.6.0" - - python-version: "3.10" - kafka-version: "2.6.0" - - python-version: "3.11" - kafka-version: "2.6.0" + - python: "3.8" + kafka: "2.6.0" + - python: "3.9" + kafka: "2.6.0" + - python: "3.10" + kafka: "2.6.0" + - python: "3.11" + kafka: "2.6.0" steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python ${{ matrix.python }} uses: actions/setup-python@v5 with: - python-version: ${{ matrix.python-version }} + python-version: ${{ matrix.python }} cache: pip cache-dependency-path: | requirements-dev.txt @@ -75,9 +75,9 @@ jobs: run: ./build_integration.sh env: PLATFORM: ${{ matrix.platform }} - KAFKA_VERSION: ${{ matrix.kafka_version }} + KAFKA_VERSION: ${{ matrix.kafka }} - name: Test with tox run: tox env: PLATFORM: ${{ matrix.platform }} - KAFKA_VERSION: ${{ matrix.kafka_version }} + KAFKA_VERSION: ${{ matrix.kafka }} diff --git a/build_integration.sh b/build_integration.sh index c020b0fe2..b74d86479 100755 --- a/build_integration.sh +++ b/build_integration.sh @@ -48,7 +48,7 @@ pushd servers echo "Downloading kafka ${kafka} tarball" TARBALL=${DIST_BASE_URL}${kafka}/${KAFKA_ARTIFACT} if command -v wget 2>/dev/null; then - wget -N $TARBALL + wget -nv -N $TARBALL else echo "wget not found... using curl" curl -f $TARBALL -o ${KAFKA_ARTIFACT}