Purge armv7, fix ubuntu matrix

myoung34 · Jun 8, 2022 · b62b07d · b62b07d
1 parent 648a819
commit b62b07d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 36 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -103,6 +103,6 @@ jobs:
           pull: true
           push: true
           tags: ${{ env.ORG }}/github-runner-base:debian-${{ matrix.release }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -41,8 +41,12 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  ubuntu_focal_deploy:
+  ubuntu_deploy:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        release: [jammy, focal, bionic]
+      fail-fast: false
     steps:
       - name: Copy Repo Files
         uses: actions/checkout@master
@@ -53,7 +57,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Copy Dockerfile
-        run: cp Dockerfile Dockerfile.ubuntu-focal; sed -i.bak "s/FROM.*/FROM ${ORG}\/github-runner-base:ubuntu-focal/" Dockerfile.ubuntu-focal
+        run: cp Dockerfile Dockerfile.ubuntu-${{ matrix.release }}; sed -i.bak 's/FROM.*/FROM ${ORG}\/github-runner-base:ubuntu-${{ matrix.release }}/' Dockerfile.ubuntu-${{ matrix.release }}
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -63,44 +67,14 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: Dockerfile.ubuntu-focal
+          file: Dockerfile.ubuntu-${{ matrix.release }}
           pull: true
           push: true
-          tags: ${{env.ORG}}/github-runner:ubuntu-focal
+          tags: ${{env.ORG}}/github-runner:ubuntu-${{ matrix.release }}
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  ubuntu_bionic_deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Copy Repo Files
-        uses: actions/checkout@master
-      - name: Get GitHub organization or user
-        run: echo 'ORG='$(echo $(dirname ${GITHUB_REPOSITORY}) | awk '{print tolower($0)}') >> $GITHUB_ENV
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Copy Dockerfile
-        run: cp Dockerfile Dockerfile.ubuntu-bionic; sed -i.bak "s/FROM.*/FROM ${ORG}\/github-runner-base:ubuntu-bionic/" Dockerfile.ubuntu-bionic
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile.ubuntu-bionic
-          pull: true
-          push: true
-          tags: ${{env.ORG}}/github-runner:ubuntu-bionic
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
   debian_deploy:
     runs-on: ubuntu-latest
     strategy:
@@ -131,6 +105,6 @@ jobs:
           pull: true
           push: true
           tags: ${{ env.ORG }}/github-runner:debian-${{ matrix.release }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max