ci: Produce OCI archives and build on all branches

.github/workflows/ostree.yml

@@ -2,8 +2,6 @@ name: Build and deploy OSTree image
 
 on:
   push:
-    branches:
-      - main
     paths-ignore:
       - "README.md"
   workflow_dispatch:
@@ -16,17 +14,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-          - ARM64
+        arch:
+          - x86_64
+          - aarch64
         variant:
           - ultramarine/base
           - ultramarine/flagship
           - ultramarine/gnome
           - ultramarine/pantheon
           - ultramarine/plasma
           - tau/home
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     permissions:
       contents: read
       packages: write
@@ -50,50 +48,17 @@ jobs:
 
       - name: Install python dependencies
         id: deps-py
-        run: pip install ostree-push yq
+        run: pip install yq
 
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login Docker
-        if: always()
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Set up OCI login credentials
-      # generate containers-auth.json with podman login --authfile containers-auth.json
-      - name: Set up OCI login credentials
-        uses: redhat-actions/[email protected]
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          auth_file_path: auth.json
-
       - name: Build OSTree
         id: build
-        run: just build-registry ${{ matrix.variant }}
+        run: just build-image ${{ matrix.variant }}
 
-      # We are going to build OSTree images through OCI now
-
-      # - name: Import GPG key
-      #   run: |
-      #     echo "${{ secrets.GPG_SIGNING_KEY }}" | gpg --import
-      #     echo "${{ secrets.GPG_KEY }}" | gpg --import
-
-      # - name: Sign OSTree commit
-      #   run: |
-      #     ostree --repo=/var/ostree gpg-sign ultramarine/37/x86_64/lapis ${{ secrets.GPG_ID }} -v
-      #     ostree --repo=/var/ostree summary -u
-
-      # - name: Import SSH credentials
-      #   uses: shimataro/[email protected]
-      #   with:
-      #     key: ${{ secrets.REPO_PRIVATE_KEY }}
-      #     known_hosts: ${{ secrets.REPO_KNOWN_HOSTS }}
-
-      # - name: Push OSTree commit
-      #   run: ostree-push --repo=/var/ostree repo@${{ secrets.REPO_IP }}:/var/www/repo.fyralabs.com/ostree
+      - name: Upload OCI image as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.variant }}-${{ matrix.arch }}-oci
+          path: images/*