chore: fix conflicts

approvers · Sep 17, 2023 · a8bf027 · a8bf027
2 parents 5dca331 + 6bacf54
commit a8bf027
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
@@ -45,7 +45,7 @@ runs:
         username: ${{ github.repository_owner }}
         password: ${{ github.token }}
     - name: Build and push
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         push: true
         tags: ${{ steps.meta.outputs.tags }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    name: Build (haracho.approvers.dev)
+    name: Build OreOreBot2
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/dockerfilelint.yml b/.github/workflows/dockerfilelint.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: hadolint/[email protected]
         id: run_hadolint
         with:
-          dockerfile: ./packages/bot/Dockerfile
+          dockerfile: ./Dockerfile
           no-color: false
           no-fail: false
 

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -24,5 +24,5 @@ jobs:
       - name: eslint (bot)
         run: yarn run lint:bot
 
-      - name: eslint (docs
+      - name: eslint (docs)
         run: yarn run lint:docs