Merge pull request #2748 from amscanne:go_branch

PiperOrigin-RevId: 313404235
This commit is contained in:
gVisor bot 2020-05-27 09:32:50 -07:00
commit c826bb3502
2 changed files with 9 additions and 2 deletions

View File

@ -17,6 +17,7 @@ jobs:
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"${{ github.event.pull_request.statuses_url }}" "${{ github.event.pull_request.statuses_url }}"
if: github.event_name == 'pull_request'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 0 fetch-depth: 0
@ -47,14 +48,14 @@ jobs:
echo -e "protocol=https\nhost=github.com\nusername=${{ secrets.GO_TOKEN }}\npassword=x-oauth-basic" | git credential approve echo -e "protocol=https\nhost=github.com\nusername=${{ secrets.GO_TOKEN }}\npassword=x-oauth-basic" | git credential approve
git remote add upstream "https://github.com/${{ github.repository }}" git remote add upstream "https://github.com/${{ github.repository }}"
git push upstream go:go git push upstream go:go
- if: ${{ success() }} - if: ${{ success() && github.event_name == 'pull_request' }}
run: | run: |
jq -nc '{"state": "success", "context": "go tests"}' | \ jq -nc '{"state": "success", "context": "go tests"}' | \
curl -sL -X POST -d @- \ curl -sL -X POST -d @- \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"${{ github.event.pull_request.statuses_url }}" "${{ github.event.pull_request.statuses_url }}"
- if: ${{ failure() }} - if: ${{ failure() && github.event_name == 'pull_request' }}
run: | run: |
jq -nc '{"state": "failure", "context": "go tests"}' | \ jq -nc '{"state": "failure", "context": "go tests"}' | \
curl -sL -X POST -d @- \ curl -sL -X POST -d @- \

View File

@ -88,6 +88,12 @@ EOF
# because they may correspond to unused templates, etc. # because they may correspond to unused templates, etc.
cp "${repo_orig}"/runsc/*.go runsc/ cp "${repo_orig}"/runsc/*.go runsc/
# Normalize all permissions. The way bazel constructs the :gopath tree may leave
# some strange permissions on files. We don't have anything in this tree that
# should be execution, only the Go source files, README.md, and ${othersrc}.
find . -type f -exec chmod 0644 {} \;
find . -type d -exec chmod 0755 {} \;
# Update the current working set and commit. # Update the current working set and commit.
git add . && git commit -m "Merge ${head} (automated)" git add . && git commit -m "Merge ${head} (automated)"