diff --git a/.github/actions/setup-action/action.yml b/.github/actions/setup-action/action.yml index cb24a065f98c..21548f55fa95 100644 --- a/.github/actions/setup-action/action.yml +++ b/.github/actions/setup-action/action.yml @@ -56,6 +56,8 @@ runs: git fetch --depth=1 origin +refs/pull/${{ github.event.issue.number }}/merge:refs/remotes/pull/${{ github.event.issue.number }}/merge || \ git fetch --depth=1 origin +refs/pull/${{ github.event.issue.number }}/head:refs/remotes/pull/${{ github.event.issue.number }}/head git checkout pull/${{ github.event.issue.number }}/merge || git checkout pull/${{ github.event.issue.number }}/head + # Add pull request head sha to env variable, used for test result publisher + echo "INPUT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Rerun if comment phrase if: ${{ github.event.comment.body == inputs.comment_phrase }} uses: ./.github/actions/rerun-job-action diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 248e8d6a69bf..000000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -version: 2 -updates: - - package-ecosystem: "gomod" - directory: "/sdks" # Location of package manifests - schedule: - interval: "daily" - - package-ecosystem: "pip" - directory: "/sdks/python" # Location of package manifests - schedule: - interval: "daily" - - package-ecosystem: "gradle" - directory: "/" # Location of package manifests - schedule: - interval: "daily" - ignore: - # Ignore gcp dependencies - - dependency-name: "com.google.api:gax*" - - dependency-name: "com.google.cloud.bigdataoss:*" - - dependency-name: "com.google.cloud:*" - - dependency-name: "com.google.code.gson:*" - - dependency-name: "com.google.oauth-client:*" - - dependency-name: "io.grpc:grpc-*" - - dependency-name: "com.google.guava:*" - - dependency-name: "com.google.protobuf:*" - - dependency-name: "com.google.cloud.datastore:datastore-v1-proto-client" - - dependency-name: "com.google.api.grpc:proto-google-cloud-*" - - dependency-name: "com.google.api.grpc:grpc-*" - - dependency-name: "com.google.http-client:*" - - dependency-name: "com.google.apis:google-api-services-*" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - allow: - # Allow only automatic updates for official github actions - # Other github-actions require approval from INFRA - - dependency-name: "actions/*" diff --git a/.github/workflows/beam_PreCommit_Java_HBase_IO_Direct.yml b/.github/workflows/beam_PreCommit_Java_HBase_IO_Direct.yml index 0664f969996e..84814e634e5d 100644 --- a/.github/workflows/beam_PreCommit_Java_HBase_IO_Direct.yml +++ b/.github/workflows/beam_PreCommit_Java_HBase_IO_Direct.yml @@ -74,7 +74,7 @@ jobs: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event.comment.body == 'Run Java_HBase_IO_Direct PreCommit' - runs-on: [self-hosted, ubuntu-20.04, main] + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - name: Setup repository diff --git a/CHANGES.md b/CHANGES.md index 40a9a1dc9490..fe72d53912cb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -59,7 +59,8 @@ * New highly anticipated feature X added to Python SDK ([#X](https://github.com/apache/beam/issues/X)). * New highly anticipated feature Y added to Java SDK ([#Y](https://github.com/apache/beam/issues/Y)). - +* New highly anticipated feature Z added to Go SDK ([#Y](https://github.com/apache/beam/issues/Y)). +* ## I/Os * Support for X source added (Java/Python) ([#X](https://github.com/apache/beam/issues/X)).