[airflow] branch v1-10-test updated (89d7358 -> 7039d6b)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a change to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.


 discard 89d7358  Default python version is used when building image
     new 7039d6b  Default python version is used when building image

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (89d7358)
            \
             N -- N -- N   refs/heads/v1-10-test (7039d6b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/build-images-workflow-run.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[airflow] 01/01: Default python version is used when building image

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 7039d6b6798cc8f04082b28c34d0f56b42e60c86
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Wed Dec 23 15:46:35 2020 +0100

    Default python version is used when building image
    
    For image build the python version is passed via
    PYTHON_MAJOR_MINOR_VERSION but there is a part of the build
    (preparing airflow package) that uses python installed on host.
    
    This is fine for Master/2.0 to use same version as the image
    but it should be unified (and in 1.10 when trying to build 2.7
    image it would fail).
    
    (cherry picked from commit ba1111a6cc3906480394b22536d5adf8a3846c82)
---
 .github/workflows/build-images-workflow-run.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-images-workflow-run.yml b/.github/workflows/build-images-workflow-run.yml
index 93b2176..ee9c48c 100644
--- a/.github/workflows/build-images-workflow-run.yml
+++ b/.github/workflows/build-images-workflow-run.yml
@@ -327,7 +327,7 @@ jobs:
       - name: "Setup python"
         uses: actions/setup-python@v2
         with:
-          python-version: ${{  matrix.python-version }}
+          python-version: 3.6
         if: steps.defaults.outputs.proceed == 'true'
       - name: >
           Override "scripts/ci" with the "${{ needs.cancel-workflow-runs.outputs.targetBranch }}" branch