forked from iree-org/iree
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request iree-org#2504 from ScottTodd:main-to-google
PiperOrigin-RevId: 321003958
- Loading branch information
Showing
54 changed files
with
981 additions
and
571 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| # Copyright 2020 Google LLC | ||
| # | ||
| # Licensed 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 | ||
| # | ||
| # https://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. | ||
|
|
||
| # Creates a PR to merge the `google` branch into the `main` branch. | ||
|
|
||
| name: google -> main | ||
|
|
||
| on: | ||
| schedule: | ||
| # Every 6 hours at 45 minutes past the hour (to be a bit behind the TF submodule update) | ||
| # 00:45, 06:45, 12:45, 18:45 UTC (04:45, 10:45, 16:45, 22:45 PST) | ||
| - cron: '45 */6 * * *' | ||
|
|
||
| jobs: | ||
| google_to_main: | ||
| # Don't run this in everyone's forks. | ||
| if: github.repository == 'google/iree' | ||
| runs-on: ubuntu-18.04 | ||
| steps: | ||
| - name: Checking out repository | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| ref: "google" | ||
| # We have to explicitly fetch the main branch as well | ||
| - name: Fetching Base Branch | ||
| run: git fetch --no-tags --prune --depth=1 origin main | ||
| - name: Checking for a diff | ||
| run: | | ||
| echo "::set-env name=has_diff::false" | ||
| git diff main --exit-code || echo "::set-env name=has_diff::true" | ||
| - name: Calculating PR body | ||
| if: env.has_diff == 'true' | ||
| run: | | ||
| echo "::set-env name=pr_body::$(git log main.. --decorate=no --pretty='format:* %h %<(80,trunc)%s')" | ||
| - name: Initializing submodules | ||
| if: env.has_diff == 'true' | ||
| run: ./scripts/git/submodule_versions.py init | ||
| - name: Creating Pull Request | ||
| if: env.has_diff == 'true' | ||
| uses: peter-evans/create-pull-request@v2 | ||
| with: | ||
| # Personal token is required to trigger additional automation (e.g. presubmits). | ||
| token: ${{ secrets.GITHUB_WRITE_ACCESS_TOKEN }} | ||
| commit-message: "Merge google -> main" | ||
| title: "Merge google -> main" | ||
| body: "${{ env.pr_body }}" | ||
| committer: "Integrate Action <[email protected]>" | ||
| # TODO(gcmn): Figure out a way to assign this to someone dynamically. | ||
| reviewers: gmngeoffrey | ||
| branch: "google-to-main" | ||
| base: "main" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,3 +65,17 @@ jobs: | |
| uses: ibiqlik/action-yamllint@v1 | ||
| with: | ||
| strict: true | ||
|
|
||
| buildifier: | ||
| runs-on: ubuntu-18.04 | ||
| steps: | ||
| - name: Checking out repository | ||
| uses: actions/checkout@v2 | ||
| - name: Running Buildifier | ||
| # TODO(gcmn): Look into only running on changed files. | ||
| uses: thompsonja/[email protected] | ||
| with: | ||
| excludes: "*/third_party/*" | ||
| # For compatibility with Google's internal source repository, we still | ||
| # use this. | ||
| warnings: "-native-cc" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,14 +36,19 @@ jobs: | |
| run: ./scripts/git/submodule_versions.py init | ||
| - name: Updating submodules | ||
| run: ./scripts/git/update_tf_llvm_submodules.py --llvm_commit=KEEP --update_build_files=true | ||
| - name: Calculating TF SHA | ||
| run: echo "::set-env name=TF_SHA::$(git submodule status third_party/tensorflow | cut -c -12)" | ||
| - name: Creating Pull Request | ||
| uses: peter-evans/create-pull-request@v2 | ||
| with: | ||
| # Personal token is required to trigger additional automation (e.g. presubmits). | ||
| token: ${{ secrets.GITHUB_WRITE_ACCESS_TOKEN }} | ||
| commit-message: "Update TF submodule and LLVM BUILD files" | ||
| title: "Update TF submodule and LLVM BUILD files" | ||
| body: "Automated submodule bump from .github/workflows/update_tf.yml" | ||
| title: "Integrate TF at https://github.com/tensorflow/tensorflow/commit/${{ env.TF_SHA }}" | ||
| body: | | ||
| "Updates TF to current HEAD and copies latest version of LLVM BUILD files. | ||
| Automated submodule bump from .github/workflows/update_tf.yml" | ||
| committer: "Submodule Update Action <[email protected]>" | ||
| # TODO(gcmn): Figure out a way to assign this to someone dynamically. | ||
| reviewers: gmngeoffrey | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.