diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index f04850895..81cbb0c49 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -193,7 +193,7 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Building Docker Image + - name: Build Docker Image uses: docker/build-push-action@v3 with: secrets: | diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml index 099ae050c..04b4c9d57 100644 --- a/.github/workflows/ci-outpost.yml +++ b/.github/workflows/ci-outpost.yml @@ -80,7 +80,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Generate API run: make gen-client-go - - name: Building Docker Image + - name: Build Docker Image uses: docker/build-push-action@v3 with: push: ${{ steps.ev.outputs.shouldBuild == 'true' }} diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index e191f86fb..df7be99f7 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -27,7 +27,7 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Building Docker Image + - name: Build Docker Image uses: docker/build-push-action@v3 with: push: ${{ github.event_name == 'release' }} @@ -75,7 +75,7 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Building Docker Image + - name: Build Docker Image uses: docker/build-push-action@v3 with: push: ${{ github.event_name == 'release' }} diff --git a/.github/workflows/web-api-publish.yml b/.github/workflows/web-api-publish.yml index 65e78b3c6..91f32fb95 100644 --- a/.github/workflows/web-api-publish.yml +++ b/.github/workflows/web-api-publish.yml @@ -28,8 +28,7 @@ jobs: run: | export VERSION=`node -e 'console.log(require("../gen-ts-api/package.json").version)'` npm i @goauthentik/api@$VERSION - - name: Create Pull Request - uses: peter-evans/create-pull-request@v4 + - uses: peter-evans/create-pull-request@v4 id: cpr with: token: ${{ secrets.BOT_GITHUB_TOKEN }} @@ -39,3 +38,8 @@ jobs: body: "web: bump API Client version" delete-branch: true signoff: true + - uses: peter-evans/enable-pull-request-automerge@v2 + with: + token: ${{ secrets.BOT_GITHUB_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash