minor

neuroforgede · Nov 6, 2023 · 48a9711 · 48a9711
1 parent 15c7bdf
commit 48a9711
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -41,29 +41,4 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - run: make create PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$(shell git describe --tags --exact-match 2> /dev/null || echo dev)-${{ matrix.arch }}
-
-  test_merge:
-    runs-on: ubuntu-latest
-    needs:
-      - test_build
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - run: |
-          IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:$(shell git describe --tags --exact-match 2> /dev/null || echo dev)
-
-          docker manifest create $IMAGE_NAME \
-            --amend $IMAGE_NAME-arm64 \
-            --amend $IMAGE_NAME-amd64
-
-          docker manifest annotate --arch amd64 $IMAGE_NAME \
-            $IMAGE_NAME-amd64
-
-          docker manifest annotate --arch arm64 $IMAGE_NAME \
-            $IMAGE_NAME-arm64
-
-          docker manifest inspect $IMAGE_NAME
+      - run: make create PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$(shell git describe --tags --exact-match 2> /dev/null || echo dev)-${{ matrix.arch }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,18 +45,25 @@ jobs:
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - run: |
-          make create PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$RELEASE_VERSION-${{ matrix.arch }} ARCH=${{ matrix.arch }}
+          make push PLUGIN_NAME=ghcr.io/${{ github.repository_owner }}/${{ github.repository }} PLUGIN_TAG=$RELEASE_VERSION-${{ matrix.arch }} ARCH=${{ matrix.arch }}
 
   release_merge:
     runs-on: ubuntu-latest
     needs:
       - release_build
     steps:
       - uses: actions/checkout@v3
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV