Skip to content

Commit 66b68f5

Browse files
committed
Oops
1 parent 34e6e40 commit 66b68f5

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,32 +85,31 @@ jobs:
8585
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8686
with:
8787
submodules: true
88-
# ensures packaging works
88+
# Ensures --all-features builds correctly, the current logic will mean it
89+
# uses stock zlib, not cmake nor cc
8990
- run: |
90-
cargo package --all-features
91-
cargo package --no-default-features --features zlib-ng-no-cmake-experimental-community-maintained
92-
cargo package --no-default-features --features zlib-ng
91+
cargo test --all-features
92+
cargo run --manifest-path systest/Cargo.toml --all-features
93+
# Ensures zlib-ng builds and runs, though zlib-ng _could_ change internally
94+
# and not use all optimizations available to the CI runner, we do this here
95+
# just for x86_64-unknown-linux-gnu to validate a common target compiles
96+
# on a more recent compiler than the incredibly ancient one currently used by cross
97+
- run: |
98+
cargo test --no-default-features --features zlib-ng-no-cmake-experimental-community-maintained || echo "::warning::failed to build libz-ng with --features zlib-ng-no-cmake-experimental-community-maintained"
99+
cargo run --manifest-path systest/Cargo.toml --no-default-features --features zlib-ng-no-cmake-experimental-community-maintained || echo "::warning::failed to run systest with --features zlib-ng-no-cmake-experimental-community-maintained"
100+
93101
102+
# ensures packaging works
94103
package:
95104
runs-on: ubuntu-22.04
96-
env:
97-
TARGET_TRIPLE: x86_64-unknown-linux-gnu
98105
steps:
99106
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
100107
with:
101108
submodules: true
102-
# Ensures --all-features builds correctly, the current logic will mean it
103-
# uses stock zlib, not cmake nor cc
104-
- run: |
105-
cargo test --target $TARGET_TRIPLE --all-features
106-
cargo run --target $TARGET_TRIPLE --manifest-path systest/Cargo.toml --all-features
107-
# Ensures zlib-ng builds and runs, though zlib-ng _could_ change internally
108-
# and not use all optimizations available to the CI runner, we do this here
109-
# just for x86_64-unknown-linux-gnu to validate a common target compiles
110-
# on a more recent compiler than the incredibly ancient one currently used by cross
111109
- run: |
112-
cargo test --target $TARGET_TRIPLE --no-default-features --features zlib-ng-no-cmake-experimental-community-maintained || echo "::warning::failed to build libz-ng with --features zlib-ng-no-cmake-experimental-community-maintained"
113-
cargo run --target $TARGET_TRIPLE --manifest-path systest/Cargo.toml --no-default-features --features zlib-ng-no-cmake-experimental-community-maintained || echo "::warning::failed to run systest with --features zlib-ng-no-cmake-experimental-community-maintained"
110+
cargo package --all-features
111+
cargo package --no-default-features --features zlib-ng-no-cmake-experimental-community-maintained
112+
cargo package --no-default-features --features zlib-ng
114113
115114
linux:
116115
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)