fix: revert temporary changes

Screenly · Feb 6, 2025 · abf4290 · abf4290
1 parent 2ada9f8
commit abf4290
Showing 1 changed file with 15 additions and 36 deletions.
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -20,38 +20,15 @@ on:
       - '!bin/start_development_server.sh'
       - '!tests/**'
       - '!docker/Dockerfile.dev'
-  # TODO: Remove this after debugging and testing.
-  pull_request:
-    branches:
-      - master
-    paths:
-      - '**'
-      - '!webview/**'
-      - '!website/**'
-      - '!.github/workflows/deploy-website.yaml'
-      - '!.github/workflows/build-webview.yaml'
-      - '!.github/workflows/build-balena-disk-image.yaml'
-      - '!.github/workflows/python-lint.yaml'
-      - '!.github/pull_request_template.md'
-      - '!README.md'
-      - '!docs/**'
-      - '!bin/install.sh'
-      - '!bin/upgrade_containers.sh'
-      - '!bin/start_development_server.sh'
-      - '!tests/**'
-      - '!docker/Dockerfile.dev'
 
 jobs:
-  # TODO: Uncomment this job when ready.
-  # run-tests:
-  #   uses: ./.github/workflows/docker-test.yaml
+  run-tests:
+    uses: ./.github/workflows/docker-test.yaml
 
   buildx:
-    # TODO: Uncomment this line when ready.
-    # needs: run-tests
+    needs: run-tests
     strategy:
       matrix:
-        # TODO: Uncomment line below when ready.
         board: ['pi1', 'pi2', 'pi3', 'pi4', 'pi4-64', 'pi5', 'x86']
         python-version: ["3.11"]
     runs-on: ubuntu-24.04
@@ -94,27 +71,29 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.board }}
 
-      # TODO: Uncomment this block when ready.
-      # - name: Login to Docker Hub
-      #   if: success() && github.event_name != 'pull_request'
-      #   uses: docker/login-action@v3
-      #   with:
-      #     username: ${{ secrets.DOCKER_USERNAME }}
-      #     password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to Docker Hub
+        if: success() && github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build Containers
         run: |
           if [ "${{ matrix.board }}" == "pi4" ]; then
             poetry run python -m tools.image_builder \
               --build-target=pi4 \
-              --target-platform=linux/arm/v8
+              --target-platform=linux/arm/v8 \
+              --push
           elif [ "${{ matrix.board }}" == "pi4-64" ]; then
             poetry run python -m tools.image_builder \
               --build-target=pi4 \
-              --target-platform=linux/arm64/v8
+              --target-platform=linux/arm64/v8 \
+              --push
           else
             poetry run python -m tools.image_builder \
-              --build-target=${{ matrix.board }}
+              --build-target=${{ matrix.board }} \
+              --push
           fi
 
   balena: