fix: Merge conflict issue (#238)

openshieldai · Nov 6, 2024 · 5c807b6 · 5c807b6
2 parents f8e7dfe + 9ede2d2
commit 5c807b6
Showing 1 changed file with 0 additions and 84 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -43,50 +43,8 @@ jobs:
           tags: ${{ steps.openshield.outputs.tags }}
           labels: ${{ steps.openshield.outputs.labels }}
 
-<<<<<<< Updated upstream
-  core-release-arm64:
-    runs-on: ubicloud-standard-2-arm
-    steps:
-      - name: Login to Github Packages
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: 🏗 Setup repo
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: latest
-
-      - name: Docker meta
-        id: openshield
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/openshieldai/openshield/openshield
-          tags: |
-            type=sha
-            type=raw,value=latest
-
-      - name: Build arm64
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: ${{ steps.openshield.outputs.tags }}
-          labels: ${{ steps.openshield.outputs.labels }}
-
-  rule-release-amd64:
-    runs-on: ubicloud-standard-2
-=======
   rule-release:
     runs-on: ubicloud-standard-4
->>>>>>> Stashed changes
     steps:
       - name: Login to Github Packages
         uses: docker/login-action@v3
@@ -122,50 +80,8 @@ jobs:
           tags: ${{ steps.rule.outputs.tags }}
           labels: ${{ steps.rule.outputs.labels }}
 
-<<<<<<< Updated upstream
-  rule-release-arm64:
-    runs-on: ubicloud-standard-2-arm
-    steps:
-      - name: Login to Github Packages
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: 🏗 Setup repo
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: latest
-
-      - name: Docker meta
-        id: rule
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/openshieldai/openshield/rule
-          tags: |
-            type=sha
-            type=raw,value=latest
-
-      - name: Build arm64
-        uses: docker/build-push-action@v6
-        with:
-          context: services/rule
-          platforms: linux/arm64
-          push: true
-          tags: ${{ steps.rule.outputs.tags }}
-          labels: ${{ steps.rule.outputs.labels }}
-
-  cache-release-amd64:
-    runs-on: ubicloud-standard-2
-=======
   cache-release:
     runs-on: ubicloud-standard-4
->>>>>>> Stashed changes
     steps:
       - name: Login to Github Packages
         uses: docker/login-action@v3