fixup

jasonish · Oct 27, 2023 · 7979339 · 7979339
1 parent ce5f88f
commit 7979339
Showing 1 changed file with 5 additions and 68 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,80 +8,17 @@ on:
 
 jobs:
 
-  # build-6-0:
-  #   runs-on: ubuntu-22.04
-  #   strategy:
-  #     matrix:
-  #       arch: [amd64, arm32v6, arm64v8]
-  #       variant: [~, profiling]
-  #     fail-fast: false
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: docker/setup-qemu-action@v1
-  #     - uses: docker/setup-buildx-action@v1
-  #     - run: ARCH=${{ matrix.arch }} ../build.sh ${{ matrix.variant }}
-  #       working-directory: "6.0"
-
-  # build-7-0:
-  #   runs-on: ubuntu-22.04
-  #   strategy:
-  #     matrix:
-  #       arch: [amd64, arm64v8]
-  #       variant: [~, profiling]
-  #     fail-fast: false
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: docker/setup-qemu-action@v1
-  #     - uses: docker/setup-buildx-action@v1
-  #     - run: ARCH=${{ matrix.arch }} ../build.sh ${{ matrix.variant }}
-  #       working-directory: "7.0"
-
-  build-master:
+  build-6-0:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        arch: [amd64, arm64v8]
+        version: ["master", "7.0", "6.0"]
+        arch: [amd64, arm32v6, arm64v8]
         variant: [~, profiling]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
-
-      - if: ${{ matrix.variant == '' }}
-        run: echo "TAG=master-${{ matrix.arch }}" >> "$GITHUB_ENV"
-
-      - if: ${{ matrix.variant != '' }}
-        run: echo "TAG=master-${{ matrix.arch }}-${{ matrix.variant}}" >> "$GITHUB_ENV"
-
-      - run: echo "Building $TAG"
-
-      - run: TAG="docker.io/jasonish/suricata:${TAG}" ARCH=${{ matrix.arch }} ../build.sh ${{ matrix.variant }}
-        working-directory: "master"
-
-      - run: docker save --output "${TAG}".tar "docker.io/jasonish/suricata:${TAG}"
-      - run: ls -lR
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: containers
-          path: "${{ env.TAG }}.tar"
-
-  push-master:
-    runs-on: ubuntu-22.04
-    needs: [build-master]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
-      - uses: actions/download-artifact@v3
-        with:
-          name: containers
-      - run: ls -lR
-      - run: |
-          for image in *.tar; do
-              docker load < $image
-          done
-      - run: docker images
-      - run: ../deploy.sh --build
-        working-directory: master
+      - run: ARCH=${{ matrix.arch }} ../build.sh ${{ matrix.variant }}
+        working-directory: ${{ matrix.version }}