From 464b4e49cb138a2209288bcbd57be9410e879f78 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 26 Feb 2024 14:39:29 +0000 Subject: [PATCH 1/7] Remove CircleCI --- .circleci/config.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 59c68b1766..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,36 +0,0 @@ -jobs: - build: - docker: - # For now, just reuse mina's Docker toolchain. In the future, we should compose Mina's from Snarky's somehow - - image: gcr.io/o1labs-192920/mina-toolchain@sha256:78508e55d17020f893971f3e5d03645c3ce35644d545ec4584322b165bfbd751 - steps: - - checkout - - run: - name: Lint - command: eval `opam config env` && make check-format - - run: eval `opam config env` && make build - - run: eval `opam config env` && make tests - opam-pin: - docker: - # For now, just reuse mina's Docker toolchain. In the future, we should compose Mina's from Snarky's somehow - - image: gcr.io/o1labs-192920/mina-toolchain@sha256:78508e55d17020f893971f3e5d03645c3ce35644d545ec4584322b165bfbd751 - steps: - - checkout - - run: - name: opam pin - command: eval `opam config env` && opam pin . - website: - docker: - - image: node - steps: - - checkout - - run: - name: Test a release build of the website - command: make test-website-build -workflows: - version: 2 - snarky_parallel: - jobs: - - website - - build - - opam-pin From f1487bb3f886ad6eb8629c2ee5216f95431f0021 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 26 Feb 2024 14:40:08 +0000 Subject: [PATCH 2/7] Remove stale job --- .github/workflows/stale.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index c535845cea..0000000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,35 +0,0 @@ -# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time. -# -# You can adjust the behavior by modifying this file. -# For more information, see: -# https://github.com/actions/stale -name: Mark stale issues and pull requests - -on: - schedule: -# ┌───────────── minute (0 - 59) -# │ ┌───────────── hour (0 - 23) -# │ │ ┌───────────── day of the month (1 - 31) -# │ │ │ ┌───────────── month (1 - 12) -# │ │ │ │ ┌───────────── day of the week (0 - 6) -# │ │ │ │ │ -# │ │ │ │ │ -# │ │ │ │ │ - - cron: '19 7 * * *' - -jobs: - stale: - - runs-on: ubuntu-latest - permissions: - issues: write - pull-requests: write - - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - stale-issue-message: 'Stale issue message' - stale-pr-message: 'Stale pull request message' - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' From 170fcac20b3400df2ae0c7af14d5e8fc626d0f6e Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 26 Feb 2024 14:44:27 +0000 Subject: [PATCH 3/7] Fixup dockerfile --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d55d56949..49b057044b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,14 +4,14 @@ FROM ocaml/opam:debian-ocaml-4.14 RUN sudo apt-get update RUN sudo apt-get install -y \ build-essential \ - pkg-config=0.29.2-1 \ + pkg-config \ git \ - libffi-dev=3.3-6 \ - libgmp-dev=2:6.2.1+dfsg-1+deb11u1 \ - libgmp3-dev=2:6.2.1+dfsg-1+deb11u1 \ - libprocps-dev=2:3.3.17-5 \ + libffi-dev \ + libgmp-dev \ + libgmp3-dev \ + libprocps-dev \ libssl-dev \ - m4=1.4.18-5 + m4 # Create a volume we can work in. For initial build, From 6bd00b9b78c2467f7603ee6008f25450eeea65a1 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 26 Feb 2024 14:47:18 +0000 Subject: [PATCH 4/7] Rename docker build --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4c12d61054..6e5c4e9758 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: - buildx: + docker-build: runs-on: ubuntu-latest steps: - @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 - id: buildx + id: docker-build with: install: true - From 58f94ef474a5d1f861067d4ec6eee7ee5736a190 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 26 Feb 2024 14:52:31 +0000 Subject: [PATCH 5/7] Add fallthrough for libprocps install --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49b057044b..c18931819d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,14 @@ RUN sudo apt-get install -y \ libffi-dev \ libgmp-dev \ libgmp3-dev \ - libprocps-dev \ libssl-dev \ m4 +RUN sudo apt-get install -y libprocps-dev || \ + sudo apt-get install -y libprocps4-dev || \ + sudo apt-get install -y libprocps3-dev || \ + sudo apt-get install -y libproc-dev + # Create a volume we can work in. For initial build, # we'll copy the local context. To update the snarky From 7294c54c6aff2cdff21afd7e4e3d2b5e9a707a97 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 26 Feb 2024 14:56:24 +0000 Subject: [PATCH 6/7] 8 as well --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c18931819d..5c61952fa9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN sudo apt-get install -y \ RUN sudo apt-get install -y libprocps-dev || \ sudo apt-get install -y libprocps4-dev || \ sudo apt-get install -y libprocps3-dev || \ + sudo apt-get install -y libprocps8-dev || \ sudo apt-get install -y libproc-dev From b61bd8e3699d6fc3990fcae4866e85f36b872c1e Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 26 Feb 2024 15:00:01 +0000 Subject: [PATCH 7/7] Remove dependency and see what happens --- Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c61952fa9..e7e93029ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,13 +12,6 @@ RUN sudo apt-get install -y \ libssl-dev \ m4 -RUN sudo apt-get install -y libprocps-dev || \ - sudo apt-get install -y libprocps4-dev || \ - sudo apt-get install -y libprocps3-dev || \ - sudo apt-get install -y libprocps8-dev || \ - sudo apt-get install -y libproc-dev - - # Create a volume we can work in. For initial build, # we'll copy the local context. To update the snarky # library itself later, bind mount your updated source