Merge pull request #1 from jackpocket/arm

Building arm64
jackpocket · Dec 9, 2024 · 7fa86ab · 7fa86ab
2 parents c003de7 + bebab45
commit 7fa86ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -14,35 +14,22 @@ on:
 
 jobs:
   build-test-deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-2core-arm64
     permissions:
       packages: write
     strategy:
       fail-fast: false
       matrix:
         distro_to_build: [
-          alma-8,
-          alma-9,
-          debian-10,
-          debian-11,
           debian-12,
-          fedora-39,
-          fedora-40,
-          opensuse-15.4,
-          opensuse-15.5,
-          opensuse-15.6,
-          ubuntu-18.04,
-          ubuntu-20.04,
-          ubuntu-22.04,
-          ubuntu-24.04
         ]
         targetplatform: [
-          linux/amd64
+          linux/arm64
         ]
     env:
       DISTRO_TO_BUILD: ${{ matrix.distro_to_build }}
       TARGETPLATFORM: ${{ matrix.targetplatform }}
-      REPO: crops/yocto
+      REPO: jackpocket/crops/yocto
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       GHCR_USERNAME: ${{ github.actor }}
@@ -57,5 +44,6 @@ jobs:
 
       # Deploy the images
       - name: Deploy
-        if: ${{ env.DOCKER_PASSWORD != '' && env.GHCR_PASSWORD != '' }}
+        #if: ${{ env.DOCKER_PASSWORD != '' && env.GHCR_PASSWORD != '' }}
+        if: ${{ env.GHCR_PASSWORD != '' }}
         run: ./deploy.sh
diff --git a/deploy.sh b/deploy.sh
@@ -16,9 +16,9 @@ fi
 # Don't deploy on pull requests because it could just be junk code that won't
 # get merged
 if ([ "${GITHUB_EVENT_NAME}" = "push" ] || [ "${GITHUB_EVENT_NAME}" = "workflow_dispatch" ] || [ "${GITHUB_EVENT_NAME}"  = "schedule" ])  && [ "${GITHUB_REF}" = "refs/heads/master" ]; then
-    echo $DOCKER_PASSWORD | ${ENGINE_CMD} login -u $DOCKER_USERNAME --password-stdin
-    ${ENGINE_CMD} push $REPO:$DISTRO_TO_BUILD-base
-    ${ENGINE_CMD} push $REPO:$DISTRO_TO_BUILD-builder
+    #echo $DOCKER_PASSWORD | ${ENGINE_CMD} login -u $DOCKER_USERNAME --password-stdin
+    #${ENGINE_CMD} push $REPO:$DISTRO_TO_BUILD-base
+    #${ENGINE_CMD} push $REPO:$DISTRO_TO_BUILD-builder
 
     ${ENGINE_CMD} tag $REPO:$DISTRO_TO_BUILD-base ghcr.io/$REPO:$DISTRO_TO_BUILD-base
     ${ENGINE_CMD} tag $REPO:$DISTRO_TO_BUILD-builder ghcr.io/$REPO:$DISTRO_TO_BUILD-builder