Skip to content

Commit 6607204

Browse files
authored
Use official dart riscv64 docker image (#2619)
1 parent 1df71a5 commit 6607204

File tree

1 file changed

+2
-31
lines changed

1 file changed

+2
-31
lines changed

.github/workflows/build-linux.yml

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- image: docker.io/library/dart
2828
platform: linux/arm/v7
2929
target: linux-arm
30-
- image: docker.io/library/debian:trixie-slim
30+
- image: docker.io/library/dart
3131
platform: linux/riscv64
3232
target: linux-riscv64
3333
- image: ghcr.io/dart-musl/dart
@@ -65,7 +65,7 @@ jobs:
6565
run: docker run --privileged --rm registry.fedoraproject.org/fedora-minimal /bin/sh -c "microdnf install --assumeyes --nodocs --setopt=install_weak_deps=False qemu-user-static systemd-udev && mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc && /usr/lib/systemd/systemd-binfmt --unregister && /usr/lib/systemd/systemd-binfmt"
6666

6767
- name: Build
68-
if: matrix.image != 'ghcr.io/dart-android/dart' && matrix.image != 'docker.io/library/debian:trixie-slim'
68+
if: matrix.image != 'ghcr.io/dart-android/dart'
6969
run: |
7070
docker run --rm -i \
7171
--platform ${{ matrix.platform }} \
@@ -93,35 +93,6 @@ jobs:
9393
dart run grinder pkg-standalone-${{ matrix.target }}
9494
EOF
9595
96-
# https://github.com/dart-lang/dart-docker/issues/96#issuecomment-1669860829
97-
# There is no official riscv64 dart container image yet, build on debian:trixie instead.
98-
# The setup is adopted from: https://github.com/dart-lang/dart-docker/blob/main/Dockerfile-debian.template
99-
- name: Build
100-
if: matrix.image == 'docker.io/library/debian:trixie-slim'
101-
run: |
102-
DART_CHANNEL=stable
103-
DART_VERSION=$(curl -fsSL https://storage.googleapis.com/dart-archive/channels/$DART_CHANNEL/release/latest/VERSION | yq .version)
104-
curl -fsSLO "https://storage.googleapis.com/dart-archive/channels/$DART_CHANNEL/release/$DART_VERSION/sdk/dartsdk-${{ matrix.target }}-release.zip"
105-
106-
docker run --rm -i \
107-
--platform ${{ matrix.platform }} \
108-
--volume "$PWD:$PWD" \
109-
--workdir "$PWD" \
110-
${{ matrix.image }} <<'EOF'
111-
set -e
112-
apt-get update
113-
apt-get install -y --no-install-recommends bind9-dnsutils ca-certificates curl git openssh-client unzip
114-
115-
export DART_SDK=/usr/lib/dart
116-
export PATH=$DART_SDK/bin:/root/.pub-cache/bin:$PATH
117-
118-
SDK="dartsdk-${{ matrix.target }}-release.zip"
119-
unzip "$SDK" && mv dart-sdk "$DART_SDK" && rm "$SDK"
120-
121-
dart pub get
122-
dart run grinder pkg-standalone-${{ matrix.target }}
123-
EOF
124-
12596
- name: Generate artifact attestation
12697
if: github.ref_type == 'tag'
12798
uses: actions/attest-build-provenance@v2

0 commit comments

Comments
 (0)