diff --git a/.github/workflows/approve.yaml b/.github/workflows/approve.yaml deleted file mode 100644 index 0310706..0000000 --- a/.github/workflows/approve.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: Auto approve - -on: - pull_request_target - -jobs: - approve: - name: Dependabot PR Auto-approve - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' - runs-on: ubuntu-latest - steps: - - uses: hmarr/auto-approve-action@v2.0.0 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml new file mode 100644 index 0000000..7c8a462 --- /dev/null +++ b/.github/workflows/automerge.yaml @@ -0,0 +1,16 @@ +name: Automerge + +on: + pull_request_target: + +jobs: + auto-merge: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + steps: + - + uses: actions/checkout@v2 + - + uses: ahmadnassri/action-dependabot-auto-merge@v2.4 + with: + github-token: ${{ secrets.token }} diff --git a/Dockerfile b/Dockerfile index 3e982e3..a172c31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=auto go build -trimpath -ldflags '-w -s -extldflag # # image used to copy our official nginx binaries -FROM nginx:1.19.7 AS base +FROM nginx:1.19.9 AS base # create empty index page RUN echo 'Hello world' > /index.html