diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a6fa903..4b343032 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,6 +45,7 @@ jobs: sys_targets: ${{vars.sys_TARGETS}} sys_versions: ${{vars.SYS_VERSIONS}} machines: ${{vars.MACHINES}} + excludes: '[{"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"}]' test: if: ${{ !failure() && !cancelled() }} @@ -68,7 +69,7 @@ jobs: needs: [lint] uses: ./.github/workflows/package.yml with: - cargo_profiles: '["release"]' + cargo_profiles: ${{vars.CARGO_PROFILES}} feat_sets: ${{vars.FEAT_SETS}} rust_toolchains: '["stable"]' sys_names: ${{vars.SYS_NAMES}} @@ -76,6 +77,7 @@ jobs: rust_targets: ${{vars.RUST_TARGETS}} sys_targets: ${{vars.sys_TARGETS}} machines: ${{vars.MACHINES}} + excludes: '[{"cargo_profile": "test"}, {"feat_set": "none"}]' publish: if: ${{ !failure() && !cancelled() }} @@ -83,7 +85,7 @@ jobs: needs: [test, package] uses: ./.github/workflows/publish.yml with: - cargo_profiles: '["release"]' + cargo_profiles: ${{vars.CARGO_PROFILES}} feat_sets: ${{vars.FEAT_SETS}} rust_toolchains: '["stable"]' sys_names: ${{vars.SYS_NAMES}} @@ -91,8 +93,9 @@ jobs: rust_targets: ${{vars.RUST_TARGETS}} sys_targets: ${{vars.sys_TARGETS}} machines: ${{vars.MACHINES}} - excludes: '[{"feat_set": "none"}]' + excludes: '[{"cargo_profile": "test"}, {"feat_set": "none"}]' docker_id: ${{vars.DOCKER_ID}} + secrets: ghcr_token: ${{ secrets.GHCR_TOKEN }} dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 253336d9..74ff17f5 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -39,12 +39,12 @@ on: jobs: deb: - if: ${{ !failure() && !cancelled() && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) }} + if: ${{ !failure() && !cancelled() && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0]) }} name: Deb uses: ./.github/workflows/bake.yml with: bake_targets: '["pkg-deb"]' - cargo_profiles: ${{inputs.cargo_profiles}} + cargo_profiles: '["release"]' feat_sets: '["all"]' rust_toolchains: ${{inputs.rust_toolchains}} sys_names: ${{inputs.sys_names}} @@ -56,12 +56,12 @@ jobs: includes: ${{inputs.includes}} rpm: - if: ${{ !failure() && !cancelled() && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) }} + if: ${{ !failure() && !cancelled() && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0]) }} name: RPM uses: ./.github/workflows/bake.yml with: bake_targets: '["pkg-rpm"]' - cargo_profiles: ${{inputs.cargo_profiles}} + cargo_profiles: '["release"]' feat_sets: '["all"]' rust_toolchains: ${{inputs.rust_toolchains}} sys_names: ${{inputs.sys_names}} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b079cef2..dfccb567 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,7 +70,7 @@ jobs: rust_targets: ${{inputs.rust_targets}} sys_targets: ${{inputs.sys_targets}} machines: ${{inputs.machines}} - excludes: '[{"cargo_profile": "release", "rust_toolchain": "nightly"}, {"cargo_profile": "test", "feat_set": "default"}]' + excludes: '[{"cargo_profile": "release", "rust_toolchain": "nightly"}, {"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"}, {"cargo_profile": "test", "feat_set": "default"}]' includes: ${{inputs.includes}} complement_tester: diff --git a/docker/Dockerfile.cargo.install b/docker/Dockerfile.cargo.install index 239ebf12..f29c83eb 100644 --- a/docker/Dockerfile.cargo.install +++ b/docker/Dockerfile.cargo.install @@ -30,7 +30,7 @@ RUN \ "test") profile_dir="debug";; "release") profile_dir="release";; "bench") profile_dir="release";; - *) profile_dir="$cargp_profile";; + *) profile_dir="$cargo_profile";; esac rustup run ${rust_toolchain} \