From 89d16bbea7c0a81a60cc8be1fff204916fbcf946 Mon Sep 17 00:00:00 2001
From: youben11 <ayoub.benaissa@zama.ai>
Date: Tue, 3 Aug 2021 13:44:48 +0100
Subject: [PATCH] chore(ci): update to GHCR to store mlir image

---
 .github/workflows/conformance.yml                 | 5 ++++-
 .github/workflows/{docker.yml => docker-mlir.yml} | 8 +++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename .github/workflows/{docker.yml => docker-mlir.yml} (66%)

diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index a3ada3c32..38c36fd53 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -24,6 +24,9 @@ jobs:
       - name: Build and test compiler
         uses: addnab/docker-run-action@v3
         with:
-          image: qbozama/mlir:69c6ea9038e5f3ef91a3c5ab59fae3276f95628b
+          registry: ghcr.io
+          image: ghcr.io/zama-ai/mlir@sha256:5b7adfbf4e28c5a7517ed0b2bb0347455dea86f495b3ba060f6bea70c9dc10d3
+          username: ${{ secrets.GHCR_LOGIN }}
+          password: ${{ secrets.GHCR_PASSWORD }}
           options: -v ${{ github.workspace }}:/workspace
           run: cd /workspace/compiler && mkdir build && cmake -B build . -DLLVM_DIR=$LLVM_PROJECT/build/lib/cmake/llvm -DMLIR_DIR=$LLVM_PROJECT/build/lib/cmake/mlir && make -C build/ zamacompiler && make test
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker-mlir.yml
similarity index 66%
rename from .github/workflows/docker.yml
rename to .github/workflows/docker-mlir.yml
index d7ed99a11..5129b62f8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker-mlir.yml
@@ -1,4 +1,4 @@
-name: Docker image
+name: Docker image (MLIR)
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
     name: Build & Publish the Docker image
     runs-on: ubuntu-latest
     env:
-      IMAGE: qbozama/mlir
+      IMAGE: ghcr.io/zama-ai/mlir
       
     steps:
       - uses: actions/checkout@v2
@@ -22,10 +22,8 @@ jobs:
         run: docker build -t $IMAGE -f builders/Dockerfile.mlir-env .
       
       - name: login
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_LOGIN }} --password-stdin
+        run: echo "${{ secrets.GHCR_PASSWORD }}" | docker login -u ${{ secrets.GHCR_LOGIN }} --password-stdin
       
       - name: tag and publish
         run: |
-          docker tag $IMAGE $IMAGE:${{ github.sha }}
           docker push $IMAGE:latest
-          docker push $IMAGE:${{ github.sha }}