You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by as...@apache.org on 2021/05/17 17:35:03 UTC

[airflow] branch v2-1-test updated (b86794b -> e31a044)

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

ash pushed a change to branch v2-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.


    omit b86794b  Update default versions v2-1-test in the 2.1 branch
     new e31a044  Update default versions v2-1-test in the 2.1 branch

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   (b86794b)
            \
             N -- N -- N   refs/heads/v2-1-test (e31a044)

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/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[airflow] 01/01: Update default versions v2-1-test in the 2.1 branch

Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ash pushed a commit to branch v2-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit e31a044579455a1023394421f68ac07206b0c5a6
Author: Ash Berlin-Taylor <as...@apache.org>
AuthorDate: Thu May 6 10:34:38 2021 +0100

    Update default versions v2-1-test in the 2.1 branch
---
 .github/workflows/ci.yml                | 4 ++--
 scripts/ci/libraries/_initialization.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 927a403..c8c1191 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,9 +21,9 @@ on:  # yamllint disable-line rule:truthy
   schedule:
     - cron: '28 0 * * *'
   push:
-    branches: ['master', 'v1-10-test', 'v1-10-stable', 'v2-0-test']
+    branches: ['master', 'v1-10-test', 'v1-10-stable', 'v2-0-test', 'v2-1-test']
   pull_request:
-    branches: ['master', 'v1-10-test', 'v1-10-stable', 'v2-0-test']
+    branches: ['master', 'v1-10-test', 'v1-10-stable', 'v2-0-test', 'v2-1-test']
 
 env:
   MOUNT_SELECTED_LOCAL_SOURCES: "false"
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 3c5a4d3..f486b6d 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -156,8 +156,8 @@ function initialization::initialize_base_variables() {
 # Determine current branch
 function initialization::initialize_branch_variables() {
     # Default branch used - this will be different in different branches
-    export DEFAULT_BRANCH=${DEFAULT_BRANCH="master"}
-    export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-master"}
+    export DEFAULT_BRANCH=${DEFAULT_BRANCH="v2-1-test"}
+    export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-2-1"}
     readonly DEFAULT_BRANCH
     readonly DEFAULT_CONSTRAINTS_BRANCH