diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 0000000..8d60877 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,30 @@ +name: automerge +on: + pull_request: + types: + - labeled + - unlabeled + - synchronize + - opened + - edited + - ready_for_review + - reopened + - unlocked + pull_request_review: + types: + - submitted + check_suite: + types: + - completed + status: {} +jobs: + automerge: + runs-on: ubuntu-latest + steps: + - name: automerge + uses: "pascalgn/automerge-action@4536e8847eb62fe2f0ee52c8fa92d17aa97f932f" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_RETRIES: 30 + MERGE_RETRY_SLEEP: 10000 + MERGE_METHOD: merge diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3fcdc8..892d913 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v1 - name: shellcheck - uses: azohra/shell-linter@v0.3.0 + uses: azohra/shell-linter@v0.4.0 - name: hadolint uses: brpaz/hadolint-action@master diff --git a/conf.env b/conf.env index 11b7bf1..0f94752 100644 --- a/conf.env +++ b/conf.env @@ -1,3 +1,3 @@ -NGINX_VERSION=1.18.0 +NGINX_VERSION=1.19.1 NGX_GEOIP2_VERSION=3.3 DOCKER_IMAGE=dcarrillo/nginx