From ee2f165460e9d80abd4c471e884040407159a914 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Thu, 6 Jul 2023 02:15:53 +0800 Subject: [PATCH] fix(ci): use debian-12 before docker publish (#225) * fix(ci): use debian-12 before docker publish * dev: remove debug listing dependencies --- .github/cross-linux-riscv64/Dockerfile | 2 +- .github/workflows/release.yaml | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/cross-linux-riscv64/Dockerfile b/.github/cross-linux-riscv64/Dockerfile index 8786ab0ff..beb64cab6 100644 --- a/.github/cross-linux-riscv64/Dockerfile +++ b/.github/cross-linux-riscv64/Dockerfile @@ -1,5 +1,5 @@ # https://github.com/wasmerio/wasmer/blob/f9ce24d504c7a14f27663741c235d80da60b1830/.github/cross-linux-riscv64/Dockerfile -FROM debian:unstable AS openssl_riscv64 +FROM debian:bookworm AS openssl_riscv64 #FROM ghcr.io/cross-rs/riscv64gc-unknown-linux-gnu:edge AS openssl_riscv64 # set CROSS_DOCKER_IN_DOCKER to inform `cross` that it is executed from within a container diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f41c41ca4..34865bb39 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -70,9 +70,6 @@ jobs: run: | sudo apt-get update -y sudo apt-get install gcc-arm-linux-gnueabihf - - name: List Depenedencies - run: | - cargo tree -e features --target ${{ matrix.rust-target }} - name: Run Native Build shell: pwsh run: | @@ -108,10 +105,6 @@ jobs: docker build -t typst-ts/riscv64 ${GITHUB_WORKSPACE}/.github/cross-linux-riscv64/ env: CROSS_DOCKER_IN_DOCKER: true - - name: List Depenedencies - run: | - echo "docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project typst-ts/riscv64:latest cargo" - docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project typst-ts/riscv64:latest cargo tree -e features --target ${CARGO_TARGET} - name: Run Cross Build run: | docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project typst-ts/riscv64:latest cargo run --bin typst-ts-fontctl @@ -149,9 +142,6 @@ jobs: - name: Configure git run: | git config --global --add safe.directory $PWD - - name: List Depenedencies - run: | - cargo tree -e features --target $RUST_TARGET - name: build binaries run: | cargo run --release --bin typst-ts-fontctl