From b19918e30607eb7886f52e162c76312c12340797 Mon Sep 17 00:00:00 2001 From: Hironsan Date: Thu, 10 Dec 2020 11:26:46 +0900 Subject: [PATCH 1/2] Update cloud run button link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8dc800b..f9ffeddb 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ If you want to add annotators/annotation approvers, see [Frequently Asked Questi |---------|---| | AWS[^1] | [![AWS CloudFormation Launch Stack SVG Button](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://console.aws.amazon.com/cloudformation/home?#/stacks/new?stackName=doccano&templateURL=https://doccano.s3.amazonaws.com/public/cloudformation/template.aws.yaml) | | Azure | [![Deploy to Azure](https://azuredeploy.net/deploybutton.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fdoccano%2Fdoccano%2Fmaster%2Fazuredeploy.json) | -| GCP[^2] | [![GCP Cloud Run PNG Button](https://storage.googleapis.com/gweb-cloudblog-publish/images/run_on_google_cloud.max-300x300.png)](https://console.cloud.google.com/cloudshell/editor?shellonly=true&cloudshell_image=gcr.io/cloudrun/doccano&cloudshell_git_repo=https://github.com/doccano/doccano.git) | +| GCP[^2] | [![GCP Cloud Run PNG Button](https://storage.googleapis.com/gweb-cloudblog-publish/images/run_on_google_cloud.max-300x300.png)](https://console.cloud.google.com/cloudshell/editor?shellonly=true&cloudshell_image=gcr.io/cloudrun/button&cloudshell_git_repo=https://github.com/doccano/doccano.git&cloudshell_git_branch=CloudRunButton) | | Heroku | [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://dashboard.heroku.com/new?template=https%3A%2F%2Fgithub.com%2Fdoccano%2Fdoccano) | > [^1]: (1) EC2 KeyPair cannot be created automatically, so make sure you have an existing EC2 KeyPair in one region. Or [create one yourself](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#having-ec2-create-your-key-pair). (2) If you want to access doccano via HTTPS in AWS, here is an [instruction](https://github.com/doccano/doccano/wiki/HTTPS-setting-for-doccano-in-AWS). From d4236b3215c39f8f8104eec3a8284043ff19cca2 Mon Sep 17 00:00:00 2001 From: Hironsan Date: Thu, 10 Dec 2020 11:34:40 +0900 Subject: [PATCH 2/2] Add a workflow for cloud run button --- .github/workflows/merge-for-cloudrun.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/merge-for-cloudrun.yml diff --git a/.github/workflows/merge-for-cloudrun.yml b/.github/workflows/merge-for-cloudrun.yml new file mode 100644 index 00000000..a6164e58 --- /dev/null +++ b/.github/workflows/merge-for-cloudrun.yml @@ -0,0 +1,18 @@ +name: Sync multiple branches +on: + push: + branches: + - 'master' +jobs: + sync-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - name: Merge master -> CloudRunButton + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: master + target_branch: CloudRunButton + github_token: ${{ secrets.GITHUB_TOKEN }}