Fix CI triggering on main branch

- CI was triggering on main branch instead of
SteamDeckHomebrew · Sep 3, 2023 · bf858fd · bf858fd
1 parent 49de9a8
commit bf858fd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,13 +7,18 @@ on:
 
 env:
   # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
+  REGISTRY: "${{ github.event_name == 'pull_request' && 'localhost:5000' || 'ghcr.io' }}"
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   docker-build:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     permissions:
       contents: read
       packages: write
@@ -24,6 +29,8 @@ jobs:
     # Workaround: https://github.com/docker/build-push-action/issues/461
     - name: Setup Docker buildx
       uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+      with:
+        driver-opts: network=host
 
     # Login against a Docker registry except on PR
     # https://github.com/docker/login-action
@@ -69,5 +76,5 @@ jobs:
         id: set
         shell: bash
         run: |
-          name="ghcr.io/${{ github.repository }}:sha-${{ github.sha }}"
+          name="${{ env.REGISTRY }}/${{ github.repository }}:sha-${{ github.sha }}"
           echo "image=${name,,}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -1,16 +1,10 @@
 name: Checks
 
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - "main"
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
 defaults:
   run:
     working-directory: "/app"
@@ -24,6 +18,11 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     container:
       image: ${{ needs.build.outputs.image }}
       credentials:
@@ -33,17 +32,26 @@ jobs:
       matrix:
         linter: [flake8, isort, black, mypy]
     steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
       - run: "make lint/${{ matrix.linter }}"
 
   test:
     runs-on: ubuntu-latest
     needs:
       - build
       - lint
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     container:
       image: ${{ needs.build.outputs.image }}
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}
     steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
       - run: "make test"
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ lint/black:
 	black --check --diff plugin_store/ tests/
 
 lint/mypy:
-	PYTHON_PATH=/app/plugin_store mypy plugin_store/ tests/
+	PYTHON_PATH=./plugin_store mypy plugin_store/ tests/
 
 lint: lint/black lint/isort lint/flake8 lint/mypy