Skip to content

Commit b2284b4

Browse files
committed
ci: fix ci
1 parent fff4139 commit b2284b4

File tree

2 files changed

+19
-27
lines changed

2 files changed

+19
-27
lines changed

.github/workflows/test_upload.yml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,28 @@ jobs:
3535
# When updating this list, the reminder to update the target list in ci.yml.
3636
include:
3737
# Native builds
38-
# - target: x86_64-unknown-linux-gnu
39-
# os: ubuntu-latest
40-
# build_tool: cargo
41-
# - target: x86_64-pc-windows-msvc
42-
# os: windows-latest
43-
# build_tool: cargo
44-
# - target: i686-pc-windows-msvc
45-
# os: windows-latest
46-
# build_tool: cargo
38+
- target: x86_64-unknown-linux-gnu
39+
os: ubuntu-latest
40+
- target: x86_64-pc-windows-msvc
41+
os: windows-latest
42+
- target: i686-pc-windows-msvc
43+
os: windows-latest
4744
- target: aarch64-apple-darwin
4845
os: macos-latest
49-
# - target: x86_64-apple-darwin
46+
- target: x86_64-apple-darwin
47+
os: macos-latest
48+
# - target: universal-apple-darwin
5049
# os: macos-latest
51-
# build_tool: cargo
52-
# # - target: universal-apple-darwin
53-
# # os: macos-latest
54-
# # build_tool: cargo
5550

5651
# Builds using cross
57-
# - target: aarch64-unknown-linux-gnu
58-
# os: ubuntu-latest
59-
# build_tool: cross
60-
# - target: x86_64-unknown-linux-musl
61-
# os: ubuntu-latest
62-
# build_tool: cross
52+
- target: aarch64-unknown-linux-gnu
53+
os: ubuntu-latest
54+
- target: x86_64-unknown-linux-musl
55+
os: ubuntu-latest
6356
- target: x86_64-unknown-freebsd
6457
os: ubuntu-latest
65-
# - target: x86_64-unknown-illumos
66-
# os: ubuntu-latest
67-
# build_tool: cross
58+
- target: x86_64-unknown-illumos
59+
os: ubuntu-latest
6860
runs-on: ${{ matrix.os }}
6961
steps:
7062
- uses: actions/checkout@v3

Cross.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ passthrough = ["CARGO_PROFILE_RELEASE_LTO"]
1313
# "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH"
1414
# ]
1515

16-
[target.x86_64-unknown-freebsd]
17-
# The current cross 0.2.4 docker image doesn't have the memstat library on FreeBSD.
18-
# https://github.com/cross-rs/cross/pull/1166
19-
image = "ghcr.io/cross-rs/x86_64-unknown-freebsd:edge"
16+
# [target.x86_64-unknown-freebsd]
17+
# # The current cross 0.2.4 docker image doesn't have the memstat library on FreeBSD.
18+
# # https://github.com/cross-rs/cross/pull/1166
19+
# image = "ghcr.io/cross-rs/x86_64-unknown-freebsd:edge"

0 commit comments

Comments
 (0)