From 3ada2abcc1818ed7d1ce1366537cfd664e9ccdfc Mon Sep 17 00:00:00 2001 From: 0xawaz Date: Thu, 30 Jan 2025 14:42:02 +0100 Subject: [PATCH 1/2] ci: fix unknown arch --- .github/workflows/common-docker.yml | 4 ++ .github/workflows/fhevm-coprocessor.yml | 1 + .github/workflows/fhevm-db-migration.yml | 1 + .github/workflows/fhevm-smart-contracts.yml | 1 + .github/workflows/publish-image.yml | 65 --------------------- 5 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 .github/workflows/publish-image.yml diff --git a/.github/workflows/common-docker.yml b/.github/workflows/common-docker.yml index da4b2784..0a694678 100644 --- a/.github/workflows/common-docker.yml +++ b/.github/workflows/common-docker.yml @@ -137,6 +137,8 @@ jobs: file: ${{ inputs.working-directory }}/${{ inputs.docker-file }} push: ${{ inputs.push_image }} pull: false + provenance: false + sbom: false tags: ghcr.io/zama-ai/${{ inputs.image-name }}:${{env.DOCKER_TAG_IMAGE }},ghcr.io/zama-ai/${{ inputs.image-name }}:latest cache-from: ${{ inputs.cache-from }} cache-to: ${{ inputs.cache-to }} @@ -167,6 +169,8 @@ jobs: file: ${{ inputs.working-directory }}/${{ inputs.docker-file-dev }} push: ${{ inputs.push_image }} pull: false + provenance: false + sbom: false tags: ghcr.io/zama-ai/${{ inputs.image-dev-name }}:${{env.DOCKER_TAG_IMAGE}},ghcr.io/zama-ai/${{ inputs.image-dev-name }}:latest cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.github/workflows/fhevm-coprocessor.yml b/.github/workflows/fhevm-coprocessor.yml index 58775b1e..aa2ca12a 100644 --- a/.github/workflows/fhevm-coprocessor.yml +++ b/.github/workflows/fhevm-coprocessor.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - aw/fix-unknown-platform paths: - .github/workflows/fhevm-coprocessor.yml - .github/workflows/common-docker.yml diff --git a/.github/workflows/fhevm-db-migration.yml b/.github/workflows/fhevm-db-migration.yml index e0026250..bd320fb3 100644 --- a/.github/workflows/fhevm-db-migration.yml +++ b/.github/workflows/fhevm-db-migration.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - aw/fix-unknown-platform paths: - .github/workflows/fhevm-coprocessor.yml - .github/workflows/common-docker.yml diff --git a/.github/workflows/fhevm-smart-contracts.yml b/.github/workflows/fhevm-smart-contracts.yml index de0a9532..d9fe7f40 100644 --- a/.github/workflows/fhevm-smart-contracts.yml +++ b/.github/workflows/fhevm-smart-contracts.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - aw/fix-unknown-platform paths: - .github/workflows/fhevm-smart-contracts.yml - .github/workflows/common-docker.yml diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml deleted file mode 100644 index 5f39e773..00000000 --- a/.github/workflows/publish-image.yml +++ /dev/null @@ -1,65 +0,0 @@ -name: Publish docker image - -on: - workflow_dispatch: - inputs: - image_tag: - description: 'Image (to be built/pushed) tag (default: latest)' - default: "latest" - type: string - required: false - ref_to_geth: - description: 'Branch, tag or commit SHA1 to checkout fhevm-backend' - required: true - default: "main" - type: string - -env: - DOCKER_IMAGE: ghcr.io/zama-ai/fhevm-coprocessor - -jobs: - push_to_registry: - name: Push Docker image to GitHub Container Registry - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - # space wasn't enough at some point - - name: Free Disk Space (Ubuntu) - uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be - - - name: Check out repo - uses: actions/checkout@v4 - - - name: Check OS - run: | - lscpu - uname -r - lsb_release -a - - - name: Login to GitHub Container Registry - uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: List files in the repository - run: | - ls ${{ github.workspace }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - platforms: linux/amd64,linux/arm64 - - - name: Build and push Docker image - uses: docker/build-push-action@v5 - with: - context: . - file: fhevm-engine/coprocessor/Dockerfile - push: true - pull: true - platforms: linux/amd64,linux/arm64 - tags: ${{ env.DOCKER_IMAGE }}:${{ inputs.image_tag }},${{ env.DOCKER_IMAGE }}:latest From eca41baf01d7309082c2c9d1fb4d4aae83077c93 Mon Sep 17 00:00:00 2001 From: 0xawaz Date: Thu, 30 Jan 2025 15:06:22 +0100 Subject: [PATCH 2/2] ci: cleanup --- .github/workflows/fhevm-coprocessor.yml | 1 - .github/workflows/fhevm-db-migration.yml | 1 - .github/workflows/fhevm-smart-contracts.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/fhevm-coprocessor.yml b/.github/workflows/fhevm-coprocessor.yml index aa2ca12a..58775b1e 100644 --- a/.github/workflows/fhevm-coprocessor.yml +++ b/.github/workflows/fhevm-coprocessor.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - aw/fix-unknown-platform paths: - .github/workflows/fhevm-coprocessor.yml - .github/workflows/common-docker.yml diff --git a/.github/workflows/fhevm-db-migration.yml b/.github/workflows/fhevm-db-migration.yml index bd320fb3..e0026250 100644 --- a/.github/workflows/fhevm-db-migration.yml +++ b/.github/workflows/fhevm-db-migration.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - aw/fix-unknown-platform paths: - .github/workflows/fhevm-coprocessor.yml - .github/workflows/common-docker.yml diff --git a/.github/workflows/fhevm-smart-contracts.yml b/.github/workflows/fhevm-smart-contracts.yml index d9fe7f40..de0a9532 100644 --- a/.github/workflows/fhevm-smart-contracts.yml +++ b/.github/workflows/fhevm-smart-contracts.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - aw/fix-unknown-platform paths: - .github/workflows/fhevm-smart-contracts.yml - .github/workflows/common-docker.yml