ameshアップデート2022/05

.github/workflows/pr-format.yml

@@ -68,10 +68,10 @@ jobs:
         continue-on-error: true
       # 差分があったときは差分を出力する
       - name: Show diff
-        if: ${{ steps.install_pipenv.outcome == 'failure'
-          || steps.format.outcome == 'failure' }}
+        id: diff
         run: |
-          git diff
+          result=$(git diff)
+          echo "::set-output name=result::$result"
       - run: |
           REPO_NAME="${{ github.event.pull_request.head.repo.full_name }}"
           echo "REPO_NAME=${REPO_NAME}" >> "${GITHUB_ENV}"
@@ -80,8 +80,7 @@ jobs:
         env:
           HEAD_REF: ${{github.event.pull_request.head.ref}}
         if: ${{ env.REPO_NAME == github.repository
-          && (steps.install_pipenv.outcome == 'failure'
-          || steps.format.outcome == 'failure') }}
+          && steps.diff.outputs.result != '' }}
         run: |
           git config user.name "github-actions[bot]"
           EMAIL="41898282+github-actions[bot]@users.noreply.github.com"
@@ -107,8 +106,7 @@ jobs:
         env:
           HEAD_REF: ${{github.event.pull_request.head.ref}}
         if: ${{ env.REPO_NAME == github.repository
-          && (steps.install_pipenv.outcome == 'failure'
-          || steps.format.outcome == 'failure') }}
+          && steps.diff.outputs.result != '' }}
         id: get_pull_requests
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
@@ -131,8 +129,7 @@ jobs:
         env:
           HEAD_REF: ${{github.event.pull_request.head.ref}}
         if: ${{ env.REPO_NAME == github.repository
-          && (steps.install_pipenv.outcome == 'failure'
-          || steps.format.outcome == 'failure')
+          && steps.diff.outputs.result != ''
           && steps.get_pull_requests.outputs.result == 0 }}
         id: create_pull_request
         with:
@@ -158,8 +155,7 @@ jobs:
       - name: Assign a user
         uses: actions/github-script@v6
         if: ${{ env.REPO_NAME == github.repository
-          && (steps.install_pipenv.outcome == 'failure'
-          || steps.format.outcome == 'failure')
+          && steps.diff.outputs.result != ''
           && steps.get_pull_requests.outputs.result == 0
           && github.event.pull_request.user.login != 'dependabot[bot]' }}
         with:
@@ -180,8 +176,7 @@ jobs:
         env:
           HEAD_REF: ${{github.event.pull_request.head.ref}}
         if: ${{ env.REPO_NAME == github.repository
-          && (steps.install_pipenv.outcome != 'failure'
-          && steps.format.outcome != 'failure') }}
+          && steps.diff.outputs.result == '' }}
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -217,6 +212,5 @@ jobs:
               await github.rest.git.deleteRef(git_deleteRef_params)
             }
       - name: Exit
-        if: ${{ steps.install_pipenv.outcome == 'failure'
-          || steps.format.outcome == 'failure' }}
+        if: steps.diff.outputs.result != ''
         run: exit 1

Dockerfile

@@ -13,8 +13,9 @@ COPY Pipfile Pipfile
 
 # Pythonライブラリのインストール時に必要なパッケージ (Pythonライブラリインストール後にアンインストール)
 # * git: Pythonライブラリのインストールの際に必要
+# * libopencv-dev: OpenCV
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends git && \
+    apt-get install -y --no-install-recommends git libopencv-dev && \
     pip install pipenv==2022.5.2 --no-cache-dir && \
     pipenv install --system --skip-lock && \
     pip uninstall -y pipenv virtualenv && \

Pipfile

@@ -16,7 +16,8 @@ mypy = "==0.950"
 [packages]
 python-dotenv = "==0.20.0"
 requests = "==2.27.1"
-Pillow = ">=7.1.2"
+Pillow = ">=9.1.0"
+opencv-python = "==4.5.5.64"
 pyperclip = "==1.8.2"
 click = "==8.0.3"
 sudden-death = {git = "https://github.com/dev-hato/sudden-death", ref = "master"}