This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-0-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 2db1ec9d19a61be98b0138267f0eeac498f8a387 Author: Ash Berlin-Taylor <[email protected]> AuthorDate: Thu Mar 11 21:29:00 2021 +0000 Remove un-needed/left over environment variables in ci.yml (#14732) AIRFLOW_COMMITERS was left over from a previous PR and should have never been included. EVENT_NAME and TARGET_COMMIT_SHA aren't needed as GitHub already provide us GITHUB_EVENT_NAME and GITHUB_SHA with the same values. (cherry picked from commit c9a7314fcecf8d51a11ce5617efb560df69f5462) --- .github/workflows/ci.yml | 7 ++----- scripts/ci/selective_ci_checks.sh | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb6bc0a..60e8086 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,6 @@ on: # yamllint disable-line rule:truthy branches: ['master', 'v1-10-test', 'v1-10-stable', 'v2-0-test'] env: - AIRFLOW_COMMITERS: ${{ secrets.AIRFLOW_COMMITERS }} MOUNT_SELECTED_LOCAL_SOURCES: "false" FORCE_ANSWER_TO_QUESTIONS: "yes" FORCE_PULL_IMAGES: "true" @@ -208,13 +207,11 @@ jobs: - name: Selective checks id: selective-checks env: - EVENT_NAME: ${{ github.event_name }} - TARGET_COMMIT_SHA: ${{ github.sha }} PR_LABELS: "${{ steps.source-run-info.outputs.pullRequestLabels }}" run: | - if [[ ${EVENT_NAME} == "pull_request" ]]; then + if [[ ${GITHUB_EVENT_NAME} == "pull_request" ]]; then # Run selective checks - ./scripts/ci/selective_ci_checks.sh "${TARGET_COMMIT_SHA}" + ./scripts/ci/selective_ci_checks.sh "${GITHUB_SHA}" else # Run all checks ./scripts/ci/selective_ci_checks.sh diff --git a/scripts/ci/selective_ci_checks.sh b/scripts/ci/selective_ci_checks.sh index adb7830..4ef07f7 100755 --- a/scripts/ci/selective_ci_checks.sh +++ b/scripts/ci/selective_ci_checks.sh @@ -45,7 +45,7 @@ fi function check_upgrade_to_newer_dependencies_needed() { # shellcheck disable=SC2153 if [[ "${UPGRADE_TO_NEWER_DEPENDENCIES}" != "false" || - ${EVENT_NAME} == 'push' || ${EVENT_NAME} == "scheduled" ]]; then + ${GITHUB_EVENT_NAME} == 'push' || ${GITHUB_EVENT_NAME} == "scheduled" ]]; then # Trigger upgrading to latest constraints where label is set or when # SHA of the merge commit triggers rebuilding layer in the docker image # Each build that upgrades to latest constraints will get truly latest constraints, not those
