diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 93b6092b3..a7e32b6b5 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,7 +7,7 @@ // For tool versions defined in GitHub Actions: "customManagers:githubActionsVersions", ], - labels: ["internal", "build:skip-release"], + labels: ["internal", "build:skip-docker", "build:skip-release"], schedule: ["* 0-3 * * 1"], semanticCommits: "disabled", separateMajorMinor: false, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a08617989..422a146e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: HAS_MACOS_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'test:macos') }} HAS_PUBLISH_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'test:publish') }} HAS_BUILD_SKIP_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'build:skip') }} + HAS_BUILD_SKIP_DOCKER_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'build:skip-docker') }} HAS_BUILD_SKIP_RELEASE_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'build:skip-release') }} HAS_BUILD_RELEASE_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'build:release') }} BASE_SHA: ${{ github.event.pull_request.base.sha }} @@ -60,6 +61,7 @@ jobs: [[ "$HAS_MACOS_LABEL" == "true" ]] && has_macos_label=1 [[ "$HAS_PUBLISH_LABEL" == "true" ]] && has_publish_label=1 [[ "$HAS_BUILD_SKIP_LABEL" == "true" ]] && has_build_skip_label=1 + [[ "$HAS_BUILD_SKIP_DOCKER_LABEL" == "true" ]] && has_build_skip_docker_label=1 [[ "$HAS_BUILD_SKIP_RELEASE_LABEL" == "true" ]] && has_build_skip_release_label=1 [[ "$HAS_BUILD_RELEASE_LABEL" == "true" ]] && has_build_release_label=1 @@ -106,7 +108,7 @@ jobs: [[ $has_integration_label || $has_extended_label || $on_main_branch ]] && test_integration=1 [[ $has_system_label || $has_extended_label || $on_main_branch || $system_workflow_changed ]] && test_system=1 [[ $has_macos_label || $has_extended_label || $on_main_branch ]] && test_macos=1 - [[ ! $has_skip_label && $docker_build_changed ]] && build_docker=1 + [[ ! $has_build_skip_label && ! $has_build_skip_docker_label && $docker_build_changed ]] && build_docker=1 # Output (convert 1/empty to true/false for GHA) out() { [[ "$2" ]] && echo "$1=true" || echo "$1=false"; }