Skip to content

Commit

Permalink
Clean up dartpy publish CI, Docker images, and pyproject settings (#1912
Browse files Browse the repository at this point in the history
)
  • Loading branch information
jslee02 authored Feb 1, 2025
1 parent 4d74bf9 commit 46027c2
Show file tree
Hide file tree
Showing 11 changed files with 99 additions and 439 deletions.
94 changes: 4 additions & 90 deletions .github/workflows/cache_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [jammy, noble, oracular]
distro: [jammy, noble, oracular, plucky]
dart_version: [v6.15]
platforms: ["linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"]
build_min: [OFF]
env:
UBUNTU_VERSION: ${{ matrix.distro }}
DART_VERSION: ${{ matrix.dart_version }}
Expand All @@ -50,15 +49,6 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
# https://github.com/marketplace/actions/build-and-push-docker-images
- name: Build and push (min)
id: docker_build_min
uses: docker/build-push-action@v6
if: ${{ matrix.build_min == 'ON' }}
with:
file: ./docker/dev/${{ env.DART_VERSION }}/Dockerfile.ubuntu.${{ env.UBUNTU_VERSION }}-min
platforms: ${{ matrix.platforms }}
push: true
tags: ${{ env.DOCKER_REPO }}:ubuntu-${{ env.UBUNTU_VERSION }}-min-${{ env.DART_VERSION }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v6
Expand All @@ -70,9 +60,9 @@ jobs:
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

# Manylinux min
manylinux_min:
name: manylinux (min)
# Manylinux
manylinux:
name: manylinux
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
Expand All @@ -84,82 +74,6 @@ jobs:
platforms: ["linux/amd64"]
dart_version: [v6.15]
experimental: [false]
include:
- dockerfile: Dockerfile.manylinux_2_28_aarch64-min
base_image: quay.io/pypa/manylinux_2_28_aarch64
image: manylinux_2_28_aarch64-min
platforms: "linux/arm64"
dart_version: v6.15
experimental: false

- dockerfile: Dockerfile.manylinux_2_28_ppc64le-min
base_image: quay.io/pypa/manylinux_2_28_ppc64le
image: manylinux_2_28_ppc64le-min
platforms: "linux/ppc64le"
dart_version: v6.15
experimental: false

- dockerfile: Dockerfile.manylinux_2_28_s390x-min
base_image: quay.io/pypa/manylinux_2_28_s390x
image: manylinux_2_28_s390x-min
platforms: "linux/s390x"
dart_version: v6.15
experimental: false
steps:
# https://github.com/marketplace/actions/docker-setup-qemu
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
# https://github.com/marketplace/actions/docker-login
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
# https://github.com/marketplace/actions/build-and-push-docker-images
- name: Build and push
id: docker_build
uses: docker/build-push-action@v6
with:
file: ./docker/dev/${{ matrix.dart_version }}/${{ matrix.dockerfile }}
platforms: ${{ matrix.platforms }}
build-args: BASE_IMAGE=${{ matrix.base_image }}
push: true
tags: ${{ env.DOCKER_REPO }}:${{ matrix.image }}-${{ matrix.dart_version }}
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

# Manylinux
manylinux:
name: manylinux
needs: [manylinux_min]
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
dockerfile: [Dockerfile.manylinux_2_28_aarch64]
base_image: ["jslee02/dart-dev:manylinux_2_28_aarch64-min-v6.15"]
image: [manylinux_2_28_aarch64]
platforms: ["linux/arm64"]
dart_version: [v6.15]
experimental: [false]
include:
- dockerfile: Dockerfile.manylinux_2_28_ppc64le
base_image: jslee02/dart-dev:manylinux_2_28_ppc64le-min-v6.15
image: manylinux_2_28_ppc64le
platforms: "linux/ppc64le"
dart_version: v6.15
experimental: false

- dockerfile: Dockerfile.manylinux_2_28_s390x
base_image: jslee02/dart-dev:manylinux_2_28_s390x-min-v6.15
image: manylinux_2_28_s390x
platforms: "linux/s390x"
dart_version: v6.15
experimental: false
steps:
# https://github.com/marketplace/actions/docker-setup-qemu
- name: Set up QEMU
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/publish_dartpy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,44 +49,44 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
build: ["cp38-manylinux_x86_64"]
build: ["cp313-manylinux_x86_64"]
experimental: [false]
release_only: [true]
release_only: [false]

include:
- os: ubuntu-latest
build: "cp39-manylinux_x86_64"
build: "cp312-manylinux_x86_64"
experimental: false
release_only: true

- os: ubuntu-latest
build: "cp310-manylinux_x86_64"
build: "cp311-manylinux_x86_64"
experimental: false
release_only: true

- os: ubuntu-latest
build: "cp311-manylinux_x86_64"
build: "cp310-manylinux_x86_64"
experimental: false
release_only: true

- os: ubuntu-latest
build: "cp312-manylinux_x86_64"
- os: macos-latest
build: "cp313-macosx_arm64"
experimental: false
release_only: false

- os: macos-latest
build: "cp312-macosx_arm64"
experimental: false
release_only: false
release_only: true

- os: windows-latest
build: "cp312-win_amd64"
build: "cp313-win_amd64"
experimental: false
release_only: false

- os: windows-latest
build: "cp312-win_arm64"
experimental: true
build: "cp312-win_amd64"
experimental: false
release_only: true

env:
Expand Down
19 changes: 0 additions & 19 deletions docker/dev/v6.15/Dockerfile.manylinux_2_28_aarch64

This file was deleted.

95 changes: 0 additions & 95 deletions docker/dev/v6.15/Dockerfile.manylinux_2_28_aarch64-min

This file was deleted.

19 changes: 0 additions & 19 deletions docker/dev/v6.15/Dockerfile.manylinux_2_28_ppc64le

This file was deleted.

Loading

0 comments on commit 46027c2

Please sign in to comment.