You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by wi...@apache.org on 2025/01/05 19:55:41 UTC
(orc) branch branch-2.1 updated (6e67d2cde -> cfc90d1b3)
This is an automated email from the ASF dual-hosted git repository.
william pushed a change to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/orc.git
discard 6e67d2cde Preparing branch for 2.1.1 development
discard 26b886c88 Preparing for release 2.1.0
new cfc90d1b3 ORC-1832: Update GitHub Action YAML file in branch-2.1
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 (6e67d2cde)
\
N -- N -- N refs/heads/branch-2.1 (cfc90d1b3)
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_and_test.yml | 6 +++---
.github/workflows/publish_snapshot.yml | 2 +-
CMakeLists.txt | 4 ++--
java/bench/core/pom.xml | 2 +-
java/bench/hive/pom.xml | 2 +-
java/bench/pom.xml | 2 +-
java/bench/spark/pom.xml | 2 +-
java/core/pom.xml | 2 +-
java/examples/pom.xml | 2 +-
java/mapreduce/pom.xml | 2 +-
java/pom.xml | 12 ++++++------
java/shims/pom.xml | 2 +-
java/tools/pom.xml | 2 +-
13 files changed, 21 insertions(+), 21 deletions(-)
(orc) 01/01: ORC-1832: Update GitHub Action YAML file in branch-2.1
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
william pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/orc.git
commit cfc90d1b392a56b0647fe07a404506975bd0efba
Author: William Hyun <wi...@apache.org>
AuthorDate: Sun Jan 5 11:55:19 2025 -0800
ORC-1832: Update GitHub Action YAML file in branch-2.1
---
.github/workflows/build_and_test.yml | 6 +++---
.github/workflows/publish_snapshot.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 7890ffcb3..280fb9efd 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -23,13 +23,13 @@ on:
- 'site/**'
- 'conan/**'
branches:
- - main
+ - branch-2.1
pull_request:
paths-ignore:
- 'site/**'
- 'conan/**'
branches:
- - main
+ - branch-2.1
# Cancel previous PR build and test
concurrency:
@@ -55,7 +55,7 @@ jobs:
- name: "Test"
run: |
cd docker
- ./run-one.sh local main ${{ matrix.os }}
+ ./run-one.sh local branch-2.1 ${{ matrix.os }}
build:
name: "Java ${{ matrix.java }} and ${{ matrix.cxx }} on ${{ matrix.os }}"
diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
index 5a91bcbfc..96a4a2beb 100644
--- a/.github/workflows/publish_snapshot.yml
+++ b/.github/workflows/publish_snapshot.yml
@@ -3,7 +3,7 @@ name: Publish Snapshot
on:
push:
branches:
- - main
+ - branch-2.1
jobs:
publish-snapshot: