Skip to content

Commit

Permalink
fix(ci): use debian-12 before docker publish (#225)
Browse files Browse the repository at this point in the history
* fix(ci): use debian-12 before docker publish

* dev: remove debug listing dependencies
  • Loading branch information
Myriad-Dreamin authored Jul 5, 2023
1 parent a616880 commit ee2f165
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion .github/cross-linux-riscv64/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ee2f165

Please sign in to comment.