From a17ae67af5f6d3083e78b66a6940953c4bd777a1 Mon Sep 17 00:00:00 2001 From: AndrewMarchukov Date: Sun, 17 Jul 2022 17:05:37 +0400 Subject: [PATCH] fixes --- .github/workflows/dependency-update.yml | 24 ++++++++++++++++++++++++ .github/workflows/docker-image.yml | 2 +- README.md | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/dependency-update.yml diff --git a/.github/workflows/dependency-update.yml b/.github/workflows/dependency-update.yml new file mode 100644 index 0000000..c24a456 --- /dev/null +++ b/.github/workflows/dependency-update.yml @@ -0,0 +1,24 @@ +name: Dependabot auto-merge +on: pull_request + +permissions: + pull-requests: write + contents: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v1.1.1 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + - name: Enable auto-merge for Dependabot PRs + run: | + gh pr review --approve "$PR_URL" + gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 32e0da0..81b1282 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -49,7 +49,7 @@ jobs: run: | git config --global user.name 'Andrew Marchukov' git config --global user.email "${EMAIL}" - git remote set-url origin https://x-access-token:${{ secrets.GIT_TOKEN }}@github.com/AndrewMarchukov/insurgency-sandstorm-server-dockerize.git + git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/AndrewMarchukov/insurgency-sandstorm-server-dockerize.git - name: check for changes if: steps.status.outcome == 'success' run: git status diff --git a/README.md b/README.md index 811eee7..5ba963c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ new options on ini files This repository contains a docker image with a dedicated server for Insurgency Sandstorm that you can fully customize to your need for COOP and PVP servers. -This image will be build daily so you don’t have to update anything inside a container. I tried to build the image as “best-practice” as possible and to document everything for you. +This image will be built any time there are updates to the steam app or upstream docker image, so you don’t have to update anything inside a container. I tried to build the image as “best-practice” as possible and to document everything for you. #### Official documentation: [Sandstorm Server Admin Guide](https://sandstorm-support.newworldinteractive.com/hc/en-us/articles/360049211072-Server-Admin-Guide) #### Another Server Admin Guide [Server Admin Guide by mod.io](https://insurgencysandstorm.mod.io/guides/server-admin-guide) #### More config examples: [Configs by zWolfi](https://github.com/zWolfi/INS_Sandstorm)