Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
sagiegurari committed Dec 15, 2023
1 parent faf595e commit 63db337
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [stable, beta, nightly, 1.67.0]
rust: [stable, beta, nightly, 1.7.0]
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- name: Checkout
Expand Down
13 changes: 13 additions & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ CARGO_MAKE_ADDITIONAL_BINARY_EXECUTABLE_NAME = "makers"
CARGO_MAKE_TEST_COVERAGE_BINARY_FILTER = "cli-[a-z0-9]*$\\|makers-[a-z0-9]*$\\|${CARGO_MAKE_TEST_COVERAGE_DEFAULT_BINARY_FILTER}"
CARGO_MAKE_TEMP_UNSTABLE_KEY = "${CARGO_MAKE_RUST_TARGET_OS}-${CARGO_MAKE_RUST_CHANNEL}-${CARGO_MAKE_CI}"
CARGO_MAKE_TEMP_UNSTABLE_TEST_ENV = { source = "${CARGO_MAKE_TEMP_UNSTABLE_KEY}", default_value = "false", mapping = { "none" = "true" } }
CARGO_MAKE_TEMP_UNSTABLE_FMT_ENV = { source = "${CARGO_MAKE_TEMP_UNSTABLE_KEY}", default_value = "false", mapping = { "windows-stable-true" = "true", "windows-beta-true" = "true", "windows-nightly-true" = "true", "linux-nightly-true" = "true" } }

[tasks.post-print-env]
category = "Tools"
Expand All @@ -24,6 +25,7 @@ echo "*************************************"
echo "Extended Info:"
echo " Unstable Environment Key: ${CARGO_MAKE_TEMP_UNSTABLE_KEY}"
echo " Unstable Test Environment: ${CARGO_MAKE_TEMP_UNSTABLE_TEST_ENV}"
echo " Unstable Format Environment: ${CARGO_MAKE_TEMP_UNSTABLE_FMT_ENV}"
echo "*************************************"
'''

Expand All @@ -50,6 +52,17 @@ delete_all ${handle}
[tasks.test-multi-phases-flow]
condition = { env_false = ["CARGO_MAKE_TEMP_UNSTABLE_TEST_ENV"] }

[tasks.check-format-ci-flow]
condition = { env_set = [
"CARGO_MAKE_RUN_CHECK_FORMAT",
], channels = [
"nightly",
], platforms = [
"linux",
], env_false = [
"CARGO_MAKE_TEMP_UNSTABLE_FMT_ENV",
] }

[tasks.audit]
ignore_errors = true

Expand Down

0 comments on commit 63db337

Please sign in to comment.